ajack 2004/01/07 09:47:25
Modified: python/gump engine.py
python/gump/syndication syndicator.py __init__.py
python/gump/test integrator.py
Log:
Syndicate before running forrest, not after. T
he old logic was that if we syndicate before generated HTML pages, we could
publish links to pages not yet generated. The thing is though, the
syndicated feed files are written to the forrest content directory (and
are referenced by forrest xdocs) so aren't published until forrest
does it.
Also, make Atom feed come out (had two methods w/ same name, removed
the one that didn't create Atom info.)
Revision Changes Path
1.44 +11 -8 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- engine.py 16 Dec 2003 17:13:47 -0000 1.43
+++ engine.py 7 Jan 2004 17:47:25 -0000 1.44
@@ -32,7 +32,7 @@
from gump.output.statsdb import *
from gump.output.repository import JarRepository
from gump.output.nag import nag
-from gump.syndication import syndicate
+from gump.syndication.syndicator import syndicate
###############################################################################
@@ -119,8 +119,15 @@
# Update [or load if not 'all'] Statistics
self.updateStatistics(run)
-
- # Build HTML Result (via Forrest)
+
+ #
+ # Provide a news feed (or few)
+ #
+ syndicate(run)
+
+ #
+ # Build HTML Result (via Forrest or ...)
+ #
documenter=run.getOptions().getDocumenter()
if documenter :
documenter.document(run)
@@ -135,11 +142,7 @@
#
# Nag about failures
#
- nag(run)
-
- # Provide a news feed
- syndicate(run)
-
+ nag(run)
# Return an exit code based off success
# :TODO: Move onto run
1.10 +0 -2 jakarta-gump/python/gump/syndication/syndicator.py
Index: syndicator.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/syndicator.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- syndicator.py 6 Jan 2004 23:44:25 -0000 1.9
+++ syndicator.py 7 Jan 2004 17:47:25 -0000 1.10
@@ -71,8 +71,6 @@
from gump.model.state import *
from gump.model.project import ProjectStatistics
-# tell Python what modules make up the gump.syndication package
-__all__ = ["rss","atom"]
class Syndicator:
def __init__(self): pass
1.4 +1 -11 jakarta-gump/python/gump/syndication/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/__init__.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- __init__.py 5 Dec 2003 00:51:49 -0000 1.3
+++ __init__.py 7 Jan 2004 17:47:25 -0000 1.4
@@ -72,14 +72,4 @@
from gump.model.project import ProjectStatistics
# tell Python what modules make up the gump.syndication package
-__all__ = ["rss","atom"]
-
-
-def syndicate(run):
-
- from gump.syndication.rss import RSSSyndicator
- simple=RSSSyndicator()
- simple.syndicate(run)
-
- #atom=AtomSyndicator()
- #atom.syndicate(run)
\ No newline at end of file
+__all__ = ["syndicator","rss","atom"]
\ No newline at end of file
1.3 +0 -1 jakarta-gump/python/gump/test/integrator.py
Index: integrator.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/integrator.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- integrator.py 4 Dec 2003 23:16:24 -0000 1.2
+++ integrator.py 7 Jan 2004 17:47:25 -0000 1.3
@@ -69,7 +69,6 @@
import gump.config
from gump.gumprun import GumpRun
from gump.engine import GumpEngine
-from gump.output.syndication import syndicate
from gump.test import getWorkedTestWorkspace
from gump.test.pyunit import UnitTestSuite
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
