You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2010/08/23 06:10:06 UTC
svn commit: r987987 - in /gump/live: ./ python/gump/core/language/java.py
python/gump/core/model/misc.py python/gump/core/model/project.py
python/gump/core/update/bzr.py python/gump/core/update/darcs.py
python/gump/core/update/hg.py
Author: bodewig
Date: Mon Aug 23 04:10:05 2010
New Revision: 987987
URL: http://svn.apache.org/viewvc?rev=987987&view=rev
Log:
merge support for multiple reports per project from trunk
Modified:
gump/live/ (props changed)
gump/live/python/gump/core/language/java.py (props changed)
gump/live/python/gump/core/model/misc.py
gump/live/python/gump/core/model/project.py
gump/live/python/gump/core/update/bzr.py (props changed)
gump/live/python/gump/core/update/darcs.py (props changed)
gump/live/python/gump/core/update/hg.py (props changed)
Propchange: gump/live/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 04:10:05 2010
@@ -1 +1 @@
-/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098
+/gump/trunk:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923
Propchange: gump/live/python/gump/core/language/java.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 04:10:05 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/language/java.py:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098
+/gump/trunk/python/gump/core/language/java.py:746160,746727,746892,747270,747272-747273,747656,748010,748018,748028,748661,748967,760784-761159,815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923
Modified: gump/live/python/gump/core/model/misc.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/misc.py?rev=987987&r1=987986&r2=987987&view=diff
==============================================================================
--- gump/live/python/gump/core/model/misc.py (original)
+++ gump/live/python/gump/core/model/misc.py Mon Aug 23 04:10:05 2010
@@ -23,7 +23,7 @@
import os
-from gump.core.model.object import NamedModelObject, ModelObject
+from gump.core.model.object import ModelObject
class Positioned:
def __init__(self):
@@ -112,8 +112,8 @@ class Resolvable(ModelObject):
def getResolvedPath(self):
return self.path
-# represents a <junitreport/> element
-class JunitReport(Resolvable):
+# represents a <report/> element
+class Report(Resolvable):
def __init__(self, dom, owner):
Resolvable.__init__(self, dom, owner)
Modified: gump/live/python/gump/core/model/project.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/project.py?rev=987987&r1=987986&r2=987987&view=diff
==============================================================================
--- gump/live/python/gump/core/model/project.py (original)
+++ gump/live/python/gump/core/model/project.py Mon Aug 23 04:10:05 2010
@@ -32,7 +32,7 @@ from gump.core.model.builder import Ant,
Script, Configure, Make
from gump.core.model.depend import Dependable, importDomDependency
from gump.core.model.misc import AddressPair, \
- Resultable, Positioned, Mkdir, Delete, JunitReport, Work
+ Resultable, Positioned, Mkdir, Delete, Report, Work
from gump.core.model.object import NamedModelObject
from gump.core.model.output import Output
from gump.core.model.state import REASON_CONFIG_FAILED, STATE_FAILED, \
@@ -583,11 +583,10 @@ class Project(NamedModelObject, Statable
self.deletes.append(delete)
# Grab all the reports (junit for now)
- if self.hasDomChild('junitreport'):
- junitreport = self.getDomChild('junitreport')
- report = JunitReport(junitreport, self)
- report.complete()
- self.reports.append(report)
+ for r in self.getDomChildIterator('junitreport'):
+ self._add_report(r)
+ for r in self.getDomChildIterator('report'):
+ self._add_report(r)
# Grab all notifications
for notifyEntry in self.getDomChildIterator('nag'):
@@ -911,6 +910,11 @@ class Project(NamedModelObject, Statable
for o in remove:
self.outputs[output_type].remove(o)
+ def _add_report(self, report_dom):
+ report = Report(report_dom, self)
+ report.complete()
+ self.reports.append(report)
+
class ProjectStatistics(Statistics):
"""Statistics Holder"""
def __init__(self, projectName):
Propchange: gump/live/python/gump/core/update/bzr.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 04:10:05 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098
+/gump/trunk/python/gump/core/update/bzr.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923
Propchange: gump/live/python/gump/core/update/darcs.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 04:10:05 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098
+/gump/trunk/python/gump/core/update/darcs.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923
Propchange: gump/live/python/gump/core/update/hg.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 23 04:10:05 2010
@@ -1 +1 @@
-/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098
+/gump/trunk/python/gump/core/update/hg.py:815848,953630-954169,955387,955837,956771,957107,957408,958453,958915,959344,959847,960260,960295,960297,960300,960303,961244,961577,961843,961859,961870,962395,962401,962981,962990,962993,963021-963048,965728-965730,980314,980756,981122,983105,986920-987098,987923