ajack 2004/05/18 13:10:45
Modified: python/gump/results Tag: MultiRunner resulter.py
python/gump Tag: MultiRunner update.py debug.py build.py
integrate.py check.py
python/gump/core Tag: MultiRunner gumprun.py misc.py
python/gump/notify Tag: MultiRunner notifier.py
python/gump/document/xdocs Tag: MultiRunner resolver.py
documenter.py
python/gump/document/text Tag: MultiRunner resolver.py
documenter.py
python/gump/repository Tag: MultiRunner publisher.py
python/gump/model Tag: MultiRunner object.py server.py
python/gump/document Tag: MultiRunner documenter.py
resolver.py
python/gump/syndication Tag: MultiRunner abstract.py
Added: python/gump/runner Tag: MultiRunner runner.py .cvsignore
tasks.py demand.py __init__.py
python/gump/core Tag: MultiRunner actor.py
python/gump/guru Tag: MultiRunner .cvsignore __init__.py
python/gump/stats Tag: MultiRunner statistician.py
Removed: python/gump/core Tag: MultiRunner demand.py tasks.py
runner.py
Log:
Safety check-in...
Revision Changes Path
No revision
No revision
1.23.2.2 +5 -2 gump/python/gump/results/resulter.py
Index: resulter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/results/resulter.py,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- resulter.py 17 May 2004 23:45:50 -0000 1.23.2.1
+++ resulter.py 18 May 2004 20:10:43 -0000 1.23.2.2
@@ -30,6 +30,9 @@
from string import lower, capitalize
from gump import log
+
+from gump.core.actor import *
+
from gump.model.object import NamedModelObject
from gump.model.workspace import *
from gump.model.module import *
@@ -38,10 +41,10 @@
from gump.results.loader import *
-class Resulter(RunActor):
+class Resulter(AbstractRunActor):
def __init__(self,run):
- RunActor.__init__(self,run)
+ AbstractRunActor.__init__(self,run)
self.workspace=run.getWorkspace()
self.gumpSet=run.getGumpSet()
No revision
No revision
1.1.2.1 +124 -0 gump/python/gump/runner/Attic/runner.py
1.1.2.1 +1 -0 gump/python/gump/runner/Attic/.cvsignore
1.1.2.1 +251 -0 gump/python/gump/runner/Attic/tasks.py
1.1.2.1 +94 -0 gump/python/gump/runner/Attic/demand.py
1.1.2.1 +21 -0 gump/python/gump/runner/Attic/__init__.py
No revision
No revision
1.28.2.3 +2 -2 gump/python/gump/update.py
Index: update.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update.py,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -r1.28.2.2 -r1.28.2.3
--- update.py 17 May 2004 21:41:21 -0000 1.28.2.2
+++ update.py 18 May 2004 20:10:44 -0000 1.28.2.3
@@ -32,7 +32,7 @@
from gump import log
from gump.core.gumpinit import gumpinit
-from gump.core.runner import getRunner
+from gump.runner.runner import getRunner
from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
from gump.core.commandLine import handleArgv
from gump.model.loader import WorkspaceLoader
1.5.2.3 +1 -1 gump/python/gump/debug.py
Index: debug.py
===================================================================
RCS file: /home/cvs/gump/python/gump/debug.py,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- debug.py 17 May 2004 21:41:21 -0000 1.5.2.2
+++ debug.py 18 May 2004 20:10:44 -0000 1.5.2.3
@@ -28,7 +28,7 @@
from gump import log
from gump.core.gumpinit import gumpinit
-from gump.core.runner import getRunner
+from gump.runner.runner import getRunner
from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
from gump.core.commandLine import handleArgv
from gump.model.loader import WorkspaceLoader
1.47.2.3 +1 -1 gump/python/gump/build.py
Index: build.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build.py,v
retrieving revision 1.47.2.2
retrieving revision 1.47.2.3
diff -u -r1.47.2.2 -r1.47.2.3
--- build.py 17 May 2004 21:41:21 -0000 1.47.2.2
+++ build.py 18 May 2004 20:10:44 -0000 1.47.2.3
@@ -29,9 +29,9 @@
from gump import log
from gump.core.gumpinit import gumpinit
-from gump.core.runner import getRunner
from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
from gump.core.commandLine import handleArgv
+from gump.runner.runner import getRunner
from gump.model.loader import WorkspaceLoader
1.27.2.3 +2 -2 gump/python/gump/integrate.py
Index: integrate.py
===================================================================
RCS file: /home/cvs/gump/python/gump/integrate.py,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -r1.27.2.2 -r1.27.2.3
--- integrate.py 17 May 2004 21:41:21 -0000 1.27.2.2
+++ integrate.py 18 May 2004 20:10:44 -0000 1.27.2.3
@@ -32,7 +32,7 @@
from gump import log
from gump.core.gumpinit import gumpinit
-from gump.core.runner import getRunner
+from gump.runner.runner import getRunner
from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
from gump.core.commandLine import handleArgv
from gump.utils import logResourceUtilization
1.43.2.3 +1 -1 gump/python/gump/check.py
Index: check.py
===================================================================
RCS file: /home/cvs/gump/python/gump/check.py,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -u -r1.43.2.2 -r1.43.2.3
--- check.py 17 May 2004 21:41:21 -0000 1.43.2.2
+++ check.py 18 May 2004 20:10:44 -0000 1.43.2.3
@@ -28,7 +28,7 @@
from gump import log
from gump.core.gumpinit import gumpinit
-from gump.core.runner import getRunner
+from gump.runner.runner import getRunner
from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
from gump.core.commandLine import handleArgv
from gump.model.loader import WorkspaceLoader
No revision
No revision
1.5.2.3 +84 -42 gump/python/gump/core/gumprun.py
Index: gumprun.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- gumprun.py 17 May 2004 23:45:52 -0000 1.5.2.2
+++ gumprun.py 18 May 2004 20:10:44 -0000 1.5.2.3
@@ -40,12 +40,6 @@
from gump.model.project import Project
from gump.model.depend import ProjectDependency
from gump.model.state import *
-
-from gump.document.text.documenter import TextDocumenter
-
-from gump.output.statsdb import *
-from gump.output.repository import JarRepository
-
###############################################################################
# Functions
@@ -361,20 +355,6 @@
# the 'forrest' build inlined.
self.xdocs=0
- # The implementation that will do it...
- self.documenter=TextDocumenter()
-
- def setDocumenter(self, documenter):
- self.documenter = documenter
-
- def getDocumenter(self):
- return self.documenter
-
- # Different Documenter have different resolvers 'cos
- # they may vary the layout
- def getResolver(self):
- return self.getDocumenter().getResolver(self)
-
def isDated(self):
return self.dated
@@ -425,37 +405,87 @@
class RunSpecific:
+ """
+ A class that is it specific to an instance of a run
+
+ """
def __init__(self, run):
self.run = run
def getRun(self):
return self.run
+
+STATE_UNSET=0
+
class RunEvent(RunSpecific):
+ """
+ An event to actors (e.g. a project built, a module updated)
+ """
+
+ def __init__(self, run):
+ RunSpecific.__init__(self,run)
+
+ def __repr__(self):
+ return self.__class__.__name__
+
+class InitializeRunEvent(RunEvent): pass
+class FinalizeRunEvent(RunEvent): pass
+
+class EntityRunEvent(RunEvent):
+ """
+
+ An event to actors (e.g. a project built, a module updated)
+
+ """
- def __init__(self, run, entity):
- RunSpecific.__init(self,run)
+ def __init__(self, run, entity, realtime=0):
+ RunEvent.__init__(self,run)
self.entity=entity
+ self.realtime=realtime
+
+ def __repr__(self):
+ return self.__class__.__name__ + ':' + `self.entity`
def getEntity(self):
- return self.entity
+ return self.entity
-class RunActor(RunSpecific):
-
- def __init__(self, run):
- RunSpecific.__init(self,run)
+ def isRealtime(self):
+ return self.realtime
- #
- # Call a method called 'prepareRun(run)', if it
- # is available on the sub-class (i.e. if needed)
- #
- def _processEvent(self,event):
- if not hasattr(self,'processEvent'): return
- if not callable(self.processEvent): return
- log.debug('Process event [' + `event` + '] using [' + `self` + ']')
- self.processEvent()
+
+class RunRequest(RunEvent):
+ """
+
+ """
+ def __init__(self, run, type):
+ RunEvent.__init__(self,run)
+ self.type=type
+ self.satisfied=0
+
+ def getType(self):
+ return self.type
+
+ def isSatisfied(self):
+ return self.satisfied
+
+class EntityRunRequest(RunEvent):
+ """
+
+ """
+
+ def __init__(self, run, type, entity):
+ RunEvent.__init__(self, run, type)
+
+ self.entity=entity
+
+ def __repr__(self):
+ return self.__class__.__name__ + ':' + `self.entity`
+
+ def getEntity(self):
+ return self.entity
class GumpRun(Workable,Annotatable,Stateful):
def __init__(self,workspace,expr=None,options=None,env=None):
@@ -470,7 +500,7 @@
self.workspace=workspace
#
- # The set of
+ # The set of modules/projects/repos in use
#
self.gumpSet=GumpSet(self.workspace,expr)
@@ -493,6 +523,7 @@
#
# A repository interface...
#
+ from gump.repository.jars import JarRepository
self.outputsRepository=JarRepository(workspace.jardir)
# Generate a GUID (or close)
@@ -500,8 +531,8 @@
import socket
m=md5.new()
self.guid = `socket.gethostname()` + ':' + workspace.getName() + ':' +
default.datetime
- m.append(self.guid)
- self.hexguid=m.hexdigest()
+ m.update(self.guid)
+ self.hexguid=m.hexdigest().upper()
log.debug('Run GUID [' + `self.guid` + '] using [' + `self.hexguid` + ']')
# Actor Queue
@@ -540,13 +571,24 @@
self.gumpSet.dump(indent+1,output)
def registerActor(self,actor):
- log.debug('Registor Actor : ' + `actor`)
+ log.debug('Register Actor : ' + `actor`)
self.actors.append(actor)
- def processEvent(self,event):
+ def dispatchEvent(self,event):
+ log.debug('Dispatch Event : ' + `event`)
for actor in self.actors:
+ log.debug('Dispatch Event : ' + `event` + ' to ' + `actor`)
actor._processEvent(event)
+ def dispatchRequest(self,request):
+ log.debug('Dispatch Request : ' + `request`)
+ for actor in self.actors:
+ log.debug('Dispatch Request : ' + `request` + ' to ' + `actor`)
+ actor._processRequest(request)
+
def generateEvent(self,entity):
- self.processEvent(RunEvent(entity))
+ self.dispatchEvent(EntityRunEvent(self, entity))
+
+ def generateRequest(self,type):
+ self.dispatchRequest(RunRequest(self, type))
1.1.2.4 +11 -9 gump/python/gump/core/Attic/misc.py
Index: misc.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/Attic/misc.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- misc.py 17 May 2004 23:45:52 -0000 1.1.2.3
+++ misc.py 18 May 2004 20:10:44 -0000 1.1.2.4
@@ -45,9 +45,9 @@
from gump.document.text.documenter import TextDocumenter
from gump.document.xdocs.documenter import XDocDocumenter
-from gump.output.statsdb import *
-from gump.output.repository import JarRepository
-from gump.output.notify import Notifier
+from gump.stats.statistician import Statistician
+from gump.repository.publisher import RepositoryPublisher
+from gump.notify.notifier import Notifier
from gump.results.resulter import gatherResults,generateResults
from gump.syndication.syndicator import syndicate
@@ -132,9 +132,9 @@
logResourceUtilization('Before document preparation')
# Prepare for documentation
- documenter=self.run.getOptions().getDocumenter()
- if documenter :
- documenter.prepare(self.run)
+ #documenter=self.run.getOptions().getDocumenter()
+ #if documenter :
+ # documenter.prepare(self.run)
def document(self):
@@ -142,9 +142,10 @@
# Build HTML Result (via Forrest or ...)
#
logResourceUtilization('Before document')
- documenter=self.run.getOptions().getDocumenter()
- if documenter :
- documenter.document(self.run)
+
+ #documenter=self.run.getOptions().getDocumenter()
+ #if documenter :
+ # documenter.document(self.run)
"""
@@ -221,6 +222,7 @@
else:
log.debug('--- Updating Project Statistics')
+ from gump.stats.statsdb import StatisticsDB
db=StatisticsDB()
workspace=self.run.getWorkspace()
No revision
Index: misc.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/Attic/misc.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- misc.py 17 May 2004 23:45:52 -0000 1.1.2.3
+++ misc.py 18 May 2004 20:10:44 -0000 1.1.2.4
@@ -45,9 +45,9 @@
from gump.document.text.documenter import TextDocumenter
from gump.document.xdocs.documenter import XDocDocumenter
-from gump.output.statsdb import *
-from gump.output.repository import JarRepository
-from gump.output.notify import Notifier
+from gump.stats.statistician import Statistician
+from gump.repository.publisher import RepositoryPublisher
+from gump.notify.notifier import Notifier
from gump.results.resulter import gatherResults,generateResults
from gump.syndication.syndicator import syndicate
@@ -132,9 +132,9 @@
logResourceUtilization('Before document preparation')
# Prepare for documentation
- documenter=self.run.getOptions().getDocumenter()
- if documenter :
- documenter.prepare(self.run)
+ #documenter=self.run.getOptions().getDocumenter()
+ #if documenter :
+ # documenter.prepare(self.run)
def document(self):
@@ -142,9 +142,10 @@
# Build HTML Result (via Forrest or ...)
#
logResourceUtilization('Before document')
- documenter=self.run.getOptions().getDocumenter()
- if documenter :
- documenter.document(self.run)
+
+ #documenter=self.run.getOptions().getDocumenter()
+ #if documenter :
+ # documenter.document(self.run)
"""
@@ -221,6 +222,7 @@
else:
log.debug('--- Updating Project Statistics')
+ from gump.stats.statsdb import StatisticsDB
db=StatisticsDB()
workspace=self.run.getWorkspace()
No revision
Index: misc.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/Attic/misc.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- misc.py 17 May 2004 23:45:52 -0000 1.1.2.3
+++ misc.py 18 May 2004 20:10:44 -0000 1.1.2.4
@@ -45,9 +45,9 @@
from gump.document.text.documenter import TextDocumenter
from gump.document.xdocs.documenter import XDocDocumenter
-from gump.output.statsdb import *
-from gump.output.repository import JarRepository
-from gump.output.notify import Notifier
+from gump.stats.statistician import Statistician
+from gump.repository.publisher import RepositoryPublisher
+from gump.notify.notifier import Notifier
from gump.results.resulter import gatherResults,generateResults
from gump.syndication.syndicator import syndicate
@@ -132,9 +132,9 @@
logResourceUtilization('Before document preparation')
# Prepare for documentation
- documenter=self.run.getOptions().getDocumenter()
- if documenter :
- documenter.prepare(self.run)
+ #documenter=self.run.getOptions().getDocumenter()
+ #if documenter :
+ # documenter.prepare(self.run)
def document(self):
@@ -142,9 +142,10 @@
# Build HTML Result (via Forrest or ...)
#
logResourceUtilization('Before document')
- documenter=self.run.getOptions().getDocumenter()
- if documenter :
- documenter.document(self.run)
+
+ #documenter=self.run.getOptions().getDocumenter()
+ #if documenter :
+ # documenter.document(self.run)
"""
@@ -221,6 +222,7 @@
else:
log.debug('--- Updating Project Statistics')
+ from gump.stats.statsdb import StatisticsDB
db=StatisticsDB()
workspace=self.run.getWorkspace()
1.1.2.1 +144 -0 gump/python/gump/core/Attic/actor.py
No revision
No revision
1.1.2.2 +4 -2 gump/python/gump/notify/Attic/notifier.py
Index: notifier.py
===================================================================
RCS file: /home/cvs/gump/python/gump/notify/Attic/notifier.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- notifier.py 17 May 2004 23:45:50 -0000 1.1.2.1
+++ notifier.py 18 May 2004 20:10:44 -0000 1.1.2.2
@@ -27,6 +27,8 @@
from gump import log
from gump.core.config import *
+from gump.core.gumprun import *
+from gump.core.actor import AbstractRunActor
from gump.model.project import *
from gump.model.module import *
from gump.model.state import *
@@ -50,11 +52,11 @@
def getFromAddress(self):
return self.fromAddr
-class Notifier(RunActor):
+class Notifier(AbstractRunActor):
def __init__(self,run):
- RunActor.__init__(self,run)
+ AbstractRunActor.__init__(self,run)
self.workspace=run.getWorkspace()
self.gumpSet=run.getGumpSet()
No revision
No revision
1.1.2.2 +0 -2 gump/python/gump/document/xdocs/Attic/resolver.py
Index: resolver.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/xdocs/Attic/resolver.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- resolver.py 17 May 2004 23:45:51 -0000 1.1.2.1
+++ resolver.py 18 May 2004 20:10:44 -0000 1.1.2.2
@@ -28,8 +28,6 @@
from gump.core.config import *
from gump.utils import *
-from gump.output.statsdb import StatisticsGuru
-from gump.output.xref import XRefGuru
from gump.utils.work import *
from gump.utils.file import *
1.1.2.2 +12 -12 gump/python/gump/document/xdocs/Attic/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/xdocs/Attic/documenter.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- documenter.py 17 May 2004 23:45:51 -0000 1.1.2.1
+++ documenter.py 18 May 2004 20:10:44 -0000 1.1.2.2
@@ -31,8 +31,8 @@
from gump.core.config import *
from gump.document.documenter import Documenter
from gump.document.text.documenter import TextDocumenter
-from gump.document.forrest.xdoc import *
-from gump.document.forrest.resolver import *
+from gump.document.xdocs.xdoc import *
+from gump.document.xdocs.resolver import *
from gump.utils import *
from gump.utils.xmlutils import xmlize
from gump.utils.tools import syncDirectories,copyDirectories,wipeDirectoryTree
@@ -44,12 +44,13 @@
from gump.model.module import Module
from gump.model.project import Project
-from gump.output.notify import Notifier
+from gump.notify.notifier import Notifier
from gump.guru.stats import StatisticsGuru
from gump.guru.xref import XRefGuru
from gump.core.gumprun import *
+from gump.core.actor import AbstractRunActor
from gump.shared.comparator import *
@@ -63,14 +64,13 @@
class XDocDocumenter(Documenter):
- def __init__(self, dirBase, urlBase):
- Documenter.__init__(self)
- self.resolver=XDocResolver(dirBase,urlBase)
+ def __init__(self, run, dirBase, urlBase):
+ Documenter.__init__(self, run)
+
+ self.setResolver(XDocResolver(dirBase,urlBase))
- def getResolver(self,run):
- return self.resolver
- def prepareRun(self, run):
+ def prepareRun(self):
log.debug('--- Prepare for Documenting Results')
@@ -80,7 +80,7 @@
# Seed with default/site skins/etc.
self.prepareXDoc(workspace)
- def documentEntity(self, entity, run):
+ def documentEntity(self, entity):
# :TODO: A work in progress
# 1) Document entity (in realtime so no lookahead links)
@@ -99,11 +99,11 @@
self.documentBuildLog(run,entity.getWorkspace(),run.getGumpSet(),1)
- def documentRun(self, run):
+ def documentRun(self):
log.debug('--- Documenting Results')
- workspace=run.getWorkspace()
+ workspace=self.run.getWorkspace()
gumpSet=run.getGumpSet()
runOptions=run.getOptions()
No revision
No revision
1.1.2.1 +1 -0 gump/python/gump/guru/Attic/.cvsignore
1.1.2.1 +18 -0 gump/python/gump/guru/Attic/__init__.py
No revision
No revision
1.4.2.1 +0 -2 gump/python/gump/document/text/resolver.py
Index: resolver.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/text/resolver.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- resolver.py 16 Apr 2004 17:28:42 -0000 1.4
+++ resolver.py 18 May 2004 20:10:45 -0000 1.4.2.1
@@ -30,8 +30,6 @@
from gump.core.config import *
from gump.utils import *
-from gump.output.statsdb import StatisticsGuru
-from gump.output.xref import XRefGuru
from gump.utils.work import *
from gump.utils.file import *
1.5.2.2 +4 -8 gump/python/gump/document/text/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/text/documenter.py,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- documenter.py 17 May 2004 23:45:51 -0000 1.5.2.1
+++ documenter.py 18 May 2004 20:10:45 -0000 1.5.2.2
@@ -41,15 +41,11 @@
class TextDocumenter(Documenter):
- def __init__(self,output=sys.stdout, dirBase='.', urlBase='.'):
- Documenter.__init__(self)
- self.output=output
+ def __init__(self, run, output=sys.stdout, dirBase='.', urlBase='.'):
+ Documenter.__init__(self, run)
- # Hack, ought return a non-hierarchical one
- self.resolver=TextResolver(dirBase,urlBase)
-
- def getResolver(self,run):
- return self.resolver
+ self.output=output
+ self.setResolver(TextResolver(dirBase,urlBase))
def documentEntity(self, entity, run):
No revision
No revision
1.1.2.2 +6 -5 gump/python/gump/repository/Attic/publisher.py
Index: publisher.py
===================================================================
RCS file: /home/cvs/gump/python/gump/repository/Attic/publisher.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- publisher.py 17 May 2004 23:45:51 -0000 1.1.2.1
+++ publisher.py 18 May 2004 20:10:45 -0000 1.1.2.2
@@ -12,8 +12,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
"""
- A Repository
+ Actor to public to a repository
"""
import os
@@ -21,13 +22,13 @@
from gump.core.config import *
from gump import log
from gump.model import *
-
-from shutil import copyfile
+from gump.core.gumprun import *
+from gump.core.actor import *
-class RepositoryPublisher(RunActor):
+class RepositoryPublisher(AbstractRunActor):
def __init__(self,run):
- RunActor.__init__(self,run)
+ AbstractRunActor.__init__(self,run)
No revision
No revision
1.23.2.2 +2 -2 gump/python/gump/model/object.py
Index: object.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/object.py,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- object.py 17 May 2004 20:22:02 -0000 1.23.2.1
+++ object.py 18 May 2004 20:10:45 -0000 1.23.2.2
@@ -153,10 +153,10 @@
return hash(self.name)
def __repr__(self):
- return str(self.__class__)+':'+self.name
+ return str(self)
def __str__(self):
- return str(self.__class__)+':'+self.name
+ return self.__class__.__name__+':'+self.name
def getName(self):
return self.name
1.18.2.1 +2 -2 gump/python/gump/model/server.py
Index: server.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/server.py,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- server.py 11 May 2004 04:20:01 -0000 1.18
+++ server.py 18 May 2004 20:10:45 -0000 1.18.2.1
@@ -37,8 +37,8 @@
if self.hasType() and self.getType() == 'python':
if self.hasUrl():
- from gump.document.forrest.resolver import ForrestResolver
- self.resolver=ForrestResolver('bogus', self.getUrl())
+ from gump.document.xdocs.resolver import XDocResolver
+ self.resolver=XDocResolver('bogus', self.getUrl())
def check(self,workspace):
pass
No revision
No revision
1.15.2.2 +10 -13 gump/python/gump/document/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/documenter.py,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- documenter.py 17 May 2004 23:45:51 -0000 1.15.2.1
+++ documenter.py 18 May 2004 20:10:45 -0000 1.15.2.2
@@ -27,11 +27,13 @@
from gump import log
-class Documenter(RunActor):
+from gump.core.actor import AbstractRunActor
+
+class Documenter(AbstractRunActor):
def __init__(self, run):
#
- RunSpecific.__init__(self, run)
+ AbstractRunActor.__init__(self, run)
#
# Call a method called 'prepareRun(run)', if it
@@ -68,14 +70,9 @@
self.documentRun()
- #
- # Get a Resolver (specifically for this run)
- #
- def getResolver(self,):
- if not hasattr(self,'getResolver'):
- raise RuntimeError, 'Class [' + `self.__class__` + '] needs a
getResolver(self)'
-
- if not callable(self.getResolver):
- raise RuntimeError, 'Class [' + `self.__class__` + '] needs a callable
getResolver(self)'
-
- return self.getResolver()
\ No newline at end of file
+
+ def setResolver(self,resolver):
+ self.resolver=resolver
+
+ def getResolver(self,resolver):
+ return self.resolver
\ No newline at end of file
1.27.2.1 +0 -2 gump/python/gump/document/resolver.py
Index: resolver.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/resolver.py,v
retrieving revision 1.27
retrieving revision 1.27.2.1
diff -u -r1.27 -r1.27.2.1
--- resolver.py 5 May 2004 17:41:33 -0000 1.27
+++ resolver.py 18 May 2004 20:10:45 -0000 1.27.2.1
@@ -30,8 +30,6 @@
from gump.core.config import *
from gump.utils import *
-from gump.output.statsdb import StatisticsGuru
-from gump.output.xref import XRefGuru
from gump.utils.work import *
from gump.utils.file import *
No revision
No revision
1.1.2.1 +36 -0 gump/python/gump/stats/Attic/statistician.py
No revision
No revision
1.1.2.2 +4 -4 gump/python/gump/syndication/Attic/abstract.py
Index: abstract.py
===================================================================
RCS file: /home/cvs/gump/python/gump/syndication/Attic/abstract.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- abstract.py 17 May 2004 23:45:50 -0000 1.1.2.1
+++ abstract.py 18 May 2004 20:10:45 -0000 1.1.2.2
@@ -76,7 +76,7 @@
def __init__(self): pass
#
- # Populate a method called 'document(run)'
+ # Populate a method called 'syndicateRun(run)'
#
def syndicate(self,run):
if not hasattr(self,'syndicateRun'):
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
