You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by aj...@apache.org on 2004/10/09 01:02:12 UTC
svn commit: rev 54126 - in gump/branches/reorg/python: gump gump/actor gump/actor/document gump/actor/document/text gump/actor/document/xdocs gump/actor/notify gump/actor/results gump/actor/stats gump/actor/syndication gump/actor/timing gump/core/model gump/core/run gump/core/runner gump/core/update gump/test gump/tool gump/tool/performance tool
Author: ajack
Date: Fri Oct 8 16:02:12 2004
New Revision: 54126
Added:
gump/branches/reorg/python/gump/actor/__init__.py
gump/branches/reorg/python/gump/tool/__init__.py
Modified:
gump/branches/reorg/python/gump/__init__.py
gump/branches/reorg/python/gump/actor/document/__init__.py
gump/branches/reorg/python/gump/actor/document/text/__init__.py
gump/branches/reorg/python/gump/actor/document/text/documenter.py
gump/branches/reorg/python/gump/actor/document/text/resolver.py
gump/branches/reorg/python/gump/actor/document/xdocs/__init__.py
gump/branches/reorg/python/gump/actor/document/xdocs/documenter.py
gump/branches/reorg/python/gump/actor/document/xdocs/resolver.py
gump/branches/reorg/python/gump/actor/document/xdocs/xdoc.py
gump/branches/reorg/python/gump/actor/notify/logic.py
gump/branches/reorg/python/gump/actor/notify/notifier.py
gump/branches/reorg/python/gump/actor/results/__init__.py
gump/branches/reorg/python/gump/actor/results/loader.py
gump/branches/reorg/python/gump/actor/results/resulter.py
gump/branches/reorg/python/gump/actor/stats/__init__.py
gump/branches/reorg/python/gump/actor/stats/statistician.py
gump/branches/reorg/python/gump/actor/syndication/__init__.py
gump/branches/reorg/python/gump/actor/syndication/abstract.py
gump/branches/reorg/python/gump/actor/syndication/atom.py
gump/branches/reorg/python/gump/actor/syndication/rss.py
gump/branches/reorg/python/gump/actor/syndication/syndicator.py
gump/branches/reorg/python/gump/actor/timing/__init__.py
gump/branches/reorg/python/gump/core/model/server.py
gump/branches/reorg/python/gump/core/run/gumprun.py
gump/branches/reorg/python/gump/core/runner/runner.py
gump/branches/reorg/python/gump/core/update/updater.py
gump/branches/reorg/python/gump/test/__init__.py
gump/branches/reorg/python/gump/test/artifacts.py
gump/branches/reorg/python/gump/test/describer.py
gump/branches/reorg/python/gump/test/documenter.py
gump/branches/reorg/python/gump/test/notifying.py
gump/branches/reorg/python/gump/test/resolving.py
gump/branches/reorg/python/gump/test/resulting.py
gump/branches/reorg/python/gump/test/stats.py
gump/branches/reorg/python/gump/test/syndicator.py
gump/branches/reorg/python/gump/test/updater.py
gump/branches/reorg/python/gump/test/xdocs.py
gump/branches/reorg/python/gump/tool/performance/deps.py
gump/branches/reorg/python/gump/tool/performance/gurus.py
gump/branches/reorg/python/gump/tool/performance/xdocs.py
gump/branches/reorg/python/tool/commitCheck.py
Log:
More reorg stuff.
Modified: gump/branches/reorg/python/gump/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/__init__.py (original)
+++ gump/branches/reorg/python/gump/__init__.py Fri Oct 8 16:02:12 2004
@@ -19,7 +19,6 @@
__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation"
__license__ = "http://www.apache.org/licenses/LICENSE-2.0"
-
#
# $Header: /home/stefano/cvs/gump/python/gump/__init__.py,v 1.25 2004/07/19 16:07:53 ajack Exp $
#
@@ -41,3 +40,6 @@
#set verbosity to show all messages of severity >= default.logLevel
log.setLevel(logging.INFO) # logging.DEBUG
+
+
+# tell Python what modules make up the gump packag
\ No newline at end of file
Added: gump/branches/reorg/python/gump/actor/__init__.py
==============================================================================
--- (empty file)
+++ gump/branches/reorg/python/gump/actor/__init__.py Fri Oct 8 16:02:12 2004
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+# Copyright 2003-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+__revision__ = "$Rev: 36667 $"
+__date__ = "$Date: 2004-08-20 08:55:45 -0600 (Fri, 20 Aug 2004) $"
+__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation"
+__license__ = "http://www.apache.org/licenses/LICENSE-2.0"
+
+
+#
+# $Header: /home/stefano/cvs/gump/python/gump/__init__.py,v 1.25 2004/07/19 16:07:53 ajack Exp $
+#
+
+"""
+
+ Gump Basic Interfaces
+
+"""
+
+# Either python-2.3 [or http://www.red-dove.com/python_logging.html]
+import logging
+
+# init logging
+logging.basicConfig()
+
+# base gump logger
+log = logging.getLogger(__name__)
+
+#set verbosity to show all messages of severity >= default.logLevel
+log.setLevel(logging.INFO) # logging.DEBUG
Modified: gump/branches/reorg/python/gump/actor/document/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/document/__init__.py Fri Oct 8 16:02:12 2004
@@ -16,5 +16,5 @@
-# tell Python what modules make up the gump.document package
+# tell Python what modules make up the gump.actor.document package
__all__ = ["documenter","resolver"]
Modified: gump/branches/reorg/python/gump/actor/document/text/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/text/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/document/text/__init__.py Fri Oct 8 16:02:12 2004
@@ -22,5 +22,5 @@
-# tell Python what modules make up the gump.document package
+# tell Python what modules make up the gump.actor.document package
__all__ = ["documenter","resolver"]
Modified: gump/branches/reorg/python/gump/actor/document/text/documenter.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/text/documenter.py (original)
+++ gump/branches/reorg/python/gump/actor/document/text/documenter.py Fri Oct 8 16:02:12 2004
@@ -42,8 +42,8 @@
from gump.core.model.module import Module
from gump.core.model.project import Project
-from gump.document.documenter import Documenter
-from gump.document.text.resolver import TextResolver
+from gump.actor.document.documenter import Documenter
+from gump.actor.document.text.resolver import TextResolver
class TextDocumenter(Documenter):
Modified: gump/branches/reorg/python/gump/actor/document/text/resolver.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/text/resolver.py (original)
+++ gump/branches/reorg/python/gump/actor/document/text/resolver.py Fri Oct 8 16:02:12 2004
@@ -50,7 +50,7 @@
from gump.core.model.object import *
from gump.core.model.state import *
-from gump.document.resolver import *
+from gump.actor.document.resolver import *
class TextResolver(Resolver):
Modified: gump/branches/reorg/python/gump/actor/document/xdocs/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/xdocs/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/document/xdocs/__init__.py Fri Oct 8 16:02:12 2004
@@ -30,6 +30,6 @@
# Initialize
###############################################################################
-# tell Python what modules make up the gump.document.xdocs package
+# tell Python what modules make up the gump.actor.document.xdocs package
__all__ = ["documenter","resolver"]
Modified: gump/branches/reorg/python/gump/actor/document/xdocs/documenter.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/xdocs/documenter.py (original)
+++ gump/branches/reorg/python/gump/actor/document/xdocs/documenter.py Fri Oct 8 16:02:12 2004
@@ -31,10 +31,10 @@
from gump import log
from gump.core.config import *
-from gump.document.documenter import Documenter
-from gump.document.text.documenter import TextDocumenter
-from gump.document.xdocs.xdoc import *
-from gump.document.xdocs.resolver import *
+from gump.actor.document.documenter import Documenter
+from gump.actor.document.text.documenter import TextDocumenter
+from gump.actor.document.xdocs.xdoc import *
+from gump.actor.document.xdocs.resolver import *
from gump.util import *
from gump.util.timing import *
from gump.util.tools import syncDirectories,copyDirectories,wipeDirectoryTree
@@ -404,7 +404,7 @@
rdfRow=table.createRow()
rdfRow.createData().createStrong('RDF Metadata')
rdfArea=rdfRow.createData()
- rdfArea.createFork('gump.rdf','RDF')
+ rdfArea.createFork('gump.actor.rdf','RDF')
def documentPartial(self,node):
notice=node.createWarning()
Modified: gump/branches/reorg/python/gump/actor/document/xdocs/resolver.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/xdocs/resolver.py (original)
+++ gump/branches/reorg/python/gump/actor/document/xdocs/resolver.py Fri Oct 8 16:02:12 2004
@@ -46,8 +46,8 @@
from gump.core.model.object import *
from gump.core.model.state import *
-from gump.document.resolver import *
-from gump.document.xdocs.config import *
+from gump.actor.document.resolver import *
+from gump.actor.document.xdocs.config import *
from gump.tool.guru.stats import *
from gump.tool.guru.xref import *
@@ -74,7 +74,7 @@
elif isinstance(object, Tracker):
path=Path(['gump_track'])
elif isinstance(object, StatisticsGuru):
- path=Path(['gump_stats'])
+ path=Path(['gump.actor.stats'])
elif isinstance(object, XRefGuru):
path=Path(['gump_xref'])
elif isinstance(object, Module):
Modified: gump/branches/reorg/python/gump/actor/document/xdocs/xdoc.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/document/xdocs/xdoc.py (original)
+++ gump/branches/reorg/python/gump/actor/document/xdocs/xdoc.py Fri Oct 8 16:02:12 2004
@@ -757,7 +757,7 @@
self.context.writeLine(' <td><a href="%s/project_todos.html">Issues</a></td><td>|</td>' % self.rootpath)
self.context.writeLine(' <td><a href="%s/project_fixes.html">Fixes</a></td><td>|</td>' % self.rootpath)
self.context.writeLine(' <td><a href="%s/project_prereqs.html">Pre-reqs</a></td><td>|</td>' % self.rootpath)
- self.context.writeLine(' <td><a href="%s/gump_stats/index.html">Stats</a></td><td>|</td>' % self.rootpath)
+ self.context.writeLine(' <td><a href="%s/gump.actor.stats/index.html">Stats</a></td><td>|</td>' % self.rootpath)
self.context.writeLine(' <td><a href="%s/gump_xref/index.html">XRef</a></td>' % self.rootpath)
self.context.writeLine(' <td colspan="3"><img align="right" src="%s/images/gump-logo.png" alt="Gump Logo"/></td>' % self.rootpath)
Modified: gump/branches/reorg/python/gump/actor/notify/logic.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/notify/logic.py (original)
+++ gump/branches/reorg/python/gump/actor/notify/logic.py Fri Oct 8 16:02:12 2004
@@ -35,7 +35,7 @@
from gump.core.model.state import *
from gump.util import *
-import gump.notify.notification
+import gump.actor.notify.notification
class NotificationLogic(RunSpecific):
@@ -67,7 +67,7 @@
#
if self.run.getOptions().isOfficial() \
or (1 == stats.sequenceInState):
- notification=gump.notify.notification.FailureNotification(self.run,entity)
+ notification=gump.actor.notify.notification.FailureNotification(self.run,entity)
elif entity.isSuccess():
#
# Notify on first success, after a failure.
@@ -75,13 +75,13 @@
if (stats.sequenceInState == 1):
if not STATE_PREREQ_FAILED == stats.previousState:
if stats.getTotalRuns() > 1:
- notification=gump.notify.notification.SuccessNotification(self.run,entity)
+ notification=gump.actor.notify.notification.SuccessNotification(self.run,entity)
else:
#
# Notify on official if contains 'errors'.
#
if self.run.getOptions().isOfficial() and entity.containsRealNasties():
- notification=gump.notify.notification.WarningNotification(self.run,entity,' contains errors')
+ notification=gump.actor.notify.notification.WarningNotification(self.run,entity,' contains errors')
#elif entity.isPrereqFailed():
# if (stats.sequenceInState == 1):
Modified: gump/branches/reorg/python/gump/actor/notify/notifier.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/notify/notifier.py (original)
+++ gump/branches/reorg/python/gump/actor/notify/notifier.py Fri Oct 8 16:02:12 2004
@@ -38,8 +38,8 @@
from gump.util.smtp import *
from gump.util import *
-from gump.notify.logic import NotificationLogic
-from gump.notify.notification import Notification
+from gump.actor.notify.logic import NotificationLogic
+from gump.actor.notify.notification import Notification
LINE ='-- -- -- -- -- -- -- -- -- -- -- -- G U M P'
SEPARATOR='*********************************************************** G U M P'
Modified: gump/branches/reorg/python/gump/actor/results/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/results/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/results/__init__.py Fri Oct 8 16:02:12 2004
@@ -17,5 +17,5 @@
-# tell Python what modules make up the gump.results package
+# tell Python what modules make up the gump.actor.results package
__all__ = ["resulter","module","loader"]
Modified: gump/branches/reorg/python/gump/actor/results/loader.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/results/loader.py (original)
+++ gump/branches/reorg/python/gump/actor/results/loader.py Fri Oct 8 16:02:12 2004
@@ -23,7 +23,7 @@
import xml.dom.minidom
from gump import log
-from gump.results.model import WorkspaceResult
+from gump.actor.results.model import WorkspaceResult
from gump.util.note import transferAnnotations, Annotatable
from gump.util.http import cacheHTTP
Modified: gump/branches/reorg/python/gump/actor/results/resulter.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/results/resulter.py (original)
+++ gump/branches/reorg/python/gump/actor/results/resulter.py Fri Oct 8 16:02:12 2004
@@ -37,8 +37,8 @@
from gump.core.model.workspace import *
from gump.core.model.module import *
from gump.core.model.project import *
-from gump.results.model import *
-from gump.results.loader import *
+from gump.actor.results.model import *
+from gump.actor.results.loader import *
class Resulter(AbstractRunActor):
Modified: gump/branches/reorg/python/gump/actor/stats/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/stats/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/stats/__init__.py Fri Oct 8 16:02:12 2004
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# tell Python what modules make up the gump.stats package
+# tell Python what modules make up the gump.actor.stats package
__all__ = ["statsdb","statistician","dbm","mysql"]
Modified: gump/branches/reorg/python/gump/actor/stats/statistician.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/stats/statistician.py (original)
+++ gump/branches/reorg/python/gump/actor/stats/statistician.py Fri Oct 8 16:02:12 2004
@@ -37,17 +37,17 @@
# MySQL is optional...
if self.run.getWorkspace().hasDatabaseInformation():
try:
- import gump.stats.mysql.statsdb
+ import gump.actor.stats.mysql.statsdb
# Figure out what DB this workspace uses
dbInfo=self.run.getWorkspace().getDatabaseInformation()
- self.db=gump.stats.mysql.statsdb.StatisticsDB(dbInfo)
+ self.db=gump.actor.stats.mysql.statsdb.StatisticsDB(dbInfo)
except Exception, details:
log.error('Failed to load MySQL database driver : %s' % (details), exc_info=1)
if not self.db:
# DBM is the fallback...
- import gump.stats.dbm.statsdb
- self.db=gump.stats.dbm.statsdb.StatisticsDB()
+ import gump.actor.stats.dbm.statsdb
+ self.db=gump.actor.stats.dbm.statsdb.StatisticsDB()
def getDatabase(self):
return self.db
Modified: gump/branches/reorg/python/gump/actor/syndication/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/syndication/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/syndication/__init__.py Fri Oct 8 16:02:12 2004
@@ -28,5 +28,5 @@
from gump.core.model.state import *
from gump.core.model.project import ProjectStatistics
-# tell Python what modules make up the gump.syndication package
+# tell Python what modules make up the gump.actor.syndication package
__all__ = ["syndicator","rss","atom"]
Modified: gump/branches/reorg/python/gump/actor/syndication/abstract.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/syndication/abstract.py (original)
+++ gump/branches/reorg/python/gump/actor/syndication/abstract.py Fri Oct 8 16:02:12 2004
@@ -29,7 +29,7 @@
from gump.core.model.state import *
from gump.core.model.project import ProjectStatistics
-from gump.document.xdocs.resolver import getDepthForObject
+from gump.actor.document.xdocs.resolver import getDepthForObject
class AbstractSyndicator(RunSpecific):
def __init__(self,run):
Modified: gump/branches/reorg/python/gump/actor/syndication/atom.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/syndication/atom.py (original)
+++ gump/branches/reorg/python/gump/actor/syndication/atom.py Fri Oct 8 16:02:12 2004
@@ -30,7 +30,7 @@
from gump.core.config import setting
-from gump.syndication.abstract import AbstractSyndicator
+from gump.actor.syndication.abstract import AbstractSyndicator
###############################################################################
Modified: gump/branches/reorg/python/gump/actor/syndication/rss.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/syndication/rss.py (original)
+++ gump/branches/reorg/python/gump/actor/syndication/rss.py Fri Oct 8 16:02:12 2004
@@ -32,7 +32,7 @@
from gump.core.config import setting
-from gump.syndication.abstract import AbstractSyndicator
+from gump.actor.syndication.abstract import AbstractSyndicator
###############################################################################
Modified: gump/branches/reorg/python/gump/actor/syndication/syndicator.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/syndication/syndicator.py (original)
+++ gump/branches/reorg/python/gump/actor/syndication/syndicator.py Fri Oct 8 16:02:12 2004
@@ -28,8 +28,8 @@
from gump import log
from gump.core.run.gumprun import *
from gump.core.run.actor import AbstractRunActor
-from gump.syndication.rss import RSSSyndicator
-from gump.syndication.atom import AtomSyndicator
+from gump.actor.syndication.rss import RSSSyndicator
+from gump.actor.syndication.atom import AtomSyndicator
class Syndicator(AbstractRunActor):
Modified: gump/branches/reorg/python/gump/actor/timing/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/actor/timing/__init__.py (original)
+++ gump/branches/reorg/python/gump/actor/timing/__init__.py Fri Oct 8 16:02:12 2004
@@ -28,5 +28,5 @@
from gump import log
-# tell Python what modules make up the gump.syndication package
+# tell Python what modules make up the gump.actor.syndication package
__all__ = ["keeper"]
Modified: gump/branches/reorg/python/gump/core/model/server.py
==============================================================================
--- gump/branches/reorg/python/gump/core/model/server.py (original)
+++ gump/branches/reorg/python/gump/core/model/server.py Fri Oct 8 16:02:12 2004
@@ -37,7 +37,7 @@
if self.hasType() and self.getType() == 'python':
if self.hasUrl():
- from gump.document.xdocs.resolver import XDocResolver
+ from gump.actor.document.xdocs.resolver import XDocResolver
self.resolver=XDocResolver('bogus', self.getUrl())
def check(self,workspace):
Modified: gump/branches/reorg/python/gump/core/run/gumprun.py
==============================================================================
--- gump/branches/reorg/python/gump/core/run/gumprun.py (original)
+++ gump/branches/reorg/python/gump/core/run/gumprun.py Fri Oct 8 16:02:12 2004
@@ -89,7 +89,7 @@
self.env=GumpEnvironment()
# A repository interface...
- from gump.repository.artifact import ArtifactRepository
+ from gump.actor.repository.artifact import ArtifactRepository
self.outputsRepository=ArtifactRepository(workspace.repodir)
# Generate a GUID (or close)
Modified: gump/branches/reorg/python/gump/core/runner/runner.py
==============================================================================
--- gump/branches/reorg/python/gump/core/runner/runner.py (original)
+++ gump/branches/reorg/python/gump/core/runner/runner.py Fri Oct 8 16:02:12 2004
@@ -24,7 +24,7 @@
from gump import log
-from gump.update.updater import *
+from gump.core.update.updater import *
from gump.core.build.builder import *
import gump.core.language.java
@@ -137,8 +137,8 @@
if self.run.getOptions().isOfficial() and \
self.run.getWorkspace().hasDatabaseInformation():
try:
- import gump.mysql.databaser
- self.run.registerActor(gump.mysql.databaser.Databaser(self.run))
+ import gump.actor.mysql.databaser
+ self.run.registerActor(gump.actor.mysql.databaser.Databaser(self.run))
except Exception, details:
log.warning('Unable to register Database Actor : %s ' % details,
exc_info=1)
@@ -164,8 +164,8 @@
# Describe [once documented]
if self.run.getOptions().isDescribe():
try:
- import gump.rdf.describer
- self.run.registerActor(gump.rdf.describer.RDFDescriber(self.run))
+ import gump.actor.rdf.describer
+ self.run.registerActor(gump.actor.rdf.describer.RDFDescriber(self.run))
except Exception, details:
log.warning('Unable to register RDF Describer : %s ' % details,
exc_info=1)
Modified: gump/branches/reorg/python/gump/core/update/updater.py
==============================================================================
--- gump/branches/reorg/python/gump/core/update/updater.py (original)
+++ gump/branches/reorg/python/gump/core/update/updater.py Fri Oct 8 16:02:12 2004
@@ -27,10 +27,10 @@
from gump.core.run.gumprun import *
from gump.core.config import dir, default, basicConfig
-from gump.update.cvs import CvsUpdater
-from gump.update.svn import SvnUpdater
-from gump.update.p4 import P4Updater
-from gump.update.artifact import ArtifactUpdater
+from gump.core.update.cvs import CvsUpdater
+from gump.core.update.svn import SvnUpdater
+from gump.core.update.p4 import P4Updater
+from gump.core.update.artifact import ArtifactUpdater
from gump.util import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
Modified: gump/branches/reorg/python/gump/test/__init__.py
==============================================================================
--- gump/branches/reorg/python/gump/test/__init__.py (original)
+++ gump/branches/reorg/python/gump/test/__init__.py Fri Oct 8 16:02:12 2004
@@ -30,7 +30,7 @@
from gump.core.model.state import *
from gump.core.model.workspace import Workspace
-from gump.stats.statistician import Statistician
+from gump.actor.stats.statistician import Statistician
from gump.util.tools import listDirectoryToFileHolder
from gump.util.work import *
@@ -94,7 +94,7 @@
def getConfiguredOptions():
options=gump.core.run.options.GumpRunOptions()
- from gump.document.xdocs.resolver import XDocResolver
+ from gump.actor.document.xdocs.resolver import XDocResolver
options.setResolver(XDocResolver('./test/bogus','http://bogus.org/'))
return options
Modified: gump/branches/reorg/python/gump/test/artifacts.py
==============================================================================
--- gump/branches/reorg/python/gump/test/artifacts.py (original)
+++ gump/branches/reorg/python/gump/test/artifacts.py Fri Oct 8 16:02:12 2004
@@ -28,8 +28,8 @@
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
-import gump.repository.artifact
-import gump.repository.publisher
+import gump.actor.repository.artifact
+import gump.actor.repository.publisher
class ArtifactsTestSuite(UnitTestSuite):
def __init__(self):
@@ -41,7 +41,7 @@
def suiteSetUp(self):
# Create a repository
- self.repo=gump.repository.artifact.ArtifactRepository(self.testRepo)
+ self.repo=gump.actor.repository.artifact.ArtifactRepository(self.testRepo)
# Create some test files
file(self.license,'w').close()
@@ -60,12 +60,12 @@
self.repo.publish('testGroup',self.jar1,'id1')
def testPublisher(self):
- p=gump.repository.publisher.RepositoryPublisher(self.run)
+ p=gump.actor.repository.publisher.RepositoryPublisher(self.run)
p.processProject(self.workspace.getProject('project1'))
def testRepositoryExtract(self):
# Create a repository & populate it
- self.repo=gump.repository.artifact.ArtifactRepository(self.testRepo)
+ self.repo=gump.actor.repository.artifact.ArtifactRepository(self.testRepo)
self.testPublishJar()
(dated, latest)=self.repo.extractGroup('testGroup')
@@ -75,7 +75,7 @@
def testRepositoryExtract2(self):
# Create a repository & populate it
- self.repo=gump.repository.artifact.ArtifactRepository(self.testRepo)
+ self.repo=gump.actor.repository.artifact.ArtifactRepository(self.testRepo)
gdir=self.repo.getGroupDir('test')
Modified: gump/branches/reorg/python/gump/test/describer.py
==============================================================================
--- gump/branches/reorg/python/gump/test/describer.py (original)
+++ gump/branches/reorg/python/gump/test/describer.py Fri Oct 8 16:02:12 2004
@@ -26,7 +26,7 @@
from gump import log
import gump.core.config
from gump.core.run.gumprun import GumpRun
-from gump.rdf.describer import RDFDescriber
+from gump.actor.rdf.describer import RDFDescriber
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
Modified: gump/branches/reorg/python/gump/test/documenter.py
==============================================================================
--- gump/branches/reorg/python/gump/test/documenter.py (original)
+++ gump/branches/reorg/python/gump/test/documenter.py Fri Oct 8 16:02:12 2004
@@ -23,9 +23,9 @@
from gump import log
import gump.core.config
from gump.core.run.gumprun import GumpRun
-from gump.document.documenter import Documenter
-from gump.document.text.documenter import TextDocumenter
-from gump.document.xdocs.documenter import XDocDocumenter
+from gump.actor.document.documenter import Documenter
+from gump.actor.document.text.documenter import TextDocumenter
+from gump.actor.document.xdocs.documenter import XDocDocumenter
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
Modified: gump/branches/reorg/python/gump/test/notifying.py
==============================================================================
--- gump/branches/reorg/python/gump/test/notifying.py (original)
+++ gump/branches/reorg/python/gump/test/notifying.py Fri Oct 8 16:02:12 2004
@@ -24,13 +24,13 @@
from gump import log
import gump.core.config
from gump.core.run.gumprun import GumpRun
-from gump.stats.statistician import Statistician
+from gump.actor.stats.statistician import Statistician
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
-from gump.notify.notifier import Notifier
-from gump.notify.notification import SuccessNotification,FailureNotification,WarningNotification
+from gump.actor.notify.notifier import Notifier
+from gump.actor.notify.notification import SuccessNotification,FailureNotification,WarningNotification
from gump.util.smtp import *
class NotificationTestSuite(UnitTestSuite):
Modified: gump/branches/reorg/python/gump/test/resolving.py
==============================================================================
--- gump/branches/reorg/python/gump/test/resolving.py (original)
+++ gump/branches/reorg/python/gump/test/resolving.py Fri Oct 8 16:02:12 2004
@@ -25,8 +25,8 @@
from gump import log
import gump.core.config
from gump.test import *
-from gump.document.text.resolver import *
-from gump.document.xdocs.resolver import *
+from gump.actor.document.text.resolver import *
+from gump.actor.document.xdocs.resolver import *
from gump.test.pyunit import UnitTestSuite
@@ -51,7 +51,7 @@
self.ant2=self.project2.getAnt()
def checkRelativePath(self,path1,path2):
- rpath=gump.document.resolver.getRelativePath(path1,path2)
+ rpath=gump.actor.document.resolver.getRelativePath(path1,path2)
self.assertNotNone('Relative Path: ', rpath)
Modified: gump/branches/reorg/python/gump/test/resulting.py
==============================================================================
--- gump/branches/reorg/python/gump/test/resulting.py (original)
+++ gump/branches/reorg/python/gump/test/resulting.py Fri Oct 8 16:02:12 2004
@@ -27,9 +27,9 @@
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
from gump.core.model.state import *
-from gump.results.model import *
-from gump.results.resulter import generateResults,Resulter
-from gump.results.loader import WorkspaceResultLoader
+from gump.actor.results.model import *
+from gump.actor.results.resulter import generateResults,Resulter
+from gump.actor.results.loader import WorkspaceResultLoader
from gump.util.smtp import *
class ResultingTestSuite(UnitTestSuite):
Modified: gump/branches/reorg/python/gump/test/stats.py
==============================================================================
--- gump/branches/reorg/python/gump/test/stats.py (original)
+++ gump/branches/reorg/python/gump/test/stats.py Fri Oct 8 16:02:12 2004
@@ -23,8 +23,8 @@
from gump import log
import gump.core.config
-from gump.stats.dbm.statsdb import StatisticsDB
-from gump.stats.statistician import Statistician
+from gump.actor.stats.dbm.statsdb import StatisticsDB
+from gump.actor.stats.statistician import Statistician
from gump.util import *
from gump.util.timing import *
from gump.test import getWorkedTestRun
Modified: gump/branches/reorg/python/gump/test/syndicator.py
==============================================================================
--- gump/branches/reorg/python/gump/test/syndicator.py (original)
+++ gump/branches/reorg/python/gump/test/syndicator.py Fri Oct 8 16:02:12 2004
@@ -26,8 +26,8 @@
from gump import log
import gump.core.config
from gump.core.run.gumprun import GumpRun
-from gump.syndication.rss import RSSSyndicator
-from gump.syndication.atom import AtomSyndicator
+from gump.actor.syndication.rss import RSSSyndicator
+from gump.actor.syndication.atom import AtomSyndicator
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
Modified: gump/branches/reorg/python/gump/test/updater.py
==============================================================================
--- gump/branches/reorg/python/gump/test/updater.py (original)
+++ gump/branches/reorg/python/gump/test/updater.py Fri Oct 8 16:02:12 2004
@@ -26,7 +26,7 @@
from gump.test import getWorkedTestRun
from gump.test.pyunit import UnitTestSuite
-from gump.update.updater import GumpUpdater
+from gump.core.update.updater import GumpUpdater
class UpdaterTestSuite(UnitTestSuite):
def __init__(self):
Modified: gump/branches/reorg/python/gump/test/xdocs.py
==============================================================================
--- gump/branches/reorg/python/gump/test/xdocs.py (original)
+++ gump/branches/reorg/python/gump/test/xdocs.py Fri Oct 8 16:02:12 2004
@@ -22,8 +22,8 @@
import types, StringIO
from gump.core.gumpinit import gumpinit
-from gump.document.xdocs.xdoc import *
-from gump.document.xdocs.config import *
+from gump.actor.document.xdocs.xdoc import *
+from gump.actor.document.xdocs.config import *
from gump.test.pyunit import UnitTestSuite
Added: gump/branches/reorg/python/gump/tool/__init__.py
==============================================================================
--- (empty file)
+++ gump/branches/reorg/python/gump/tool/__init__.py Fri Oct 8 16:02:12 2004
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+# Copyright 2003-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+__revision__ = "$Rev: 36667 $"
+__date__ = "$Date: 2004-08-20 08:55:45 -0600 (Fri, 20 Aug 2004) $"
+__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation"
+__license__ = "http://www.apache.org/licenses/LICENSE-2.0"
+
+
+#
+# $Header: /home/stefano/cvs/gump/python/gump/__init__.py,v 1.25 2004/07/19 16:07:53 ajack Exp $
+#
+
+"""
+
+ Gump Basic Interfaces
+
+"""
+
+# Either python-2.3 [or http://www.red-dove.com/python_logging.html]
+import logging
+
+# init logging
+logging.basicConfig()
+
+# base gump logger
+log = logging.getLogger(__name__)
+
+#set verbosity to show all messages of severity >= default.logLevel
+log.setLevel(logging.INFO) # logging.DEBUG
Modified: gump/branches/reorg/python/gump/tool/performance/deps.py
==============================================================================
--- gump/branches/reorg/python/gump/tool/performance/deps.py (original)
+++ gump/branches/reorg/python/gump/tool/performance/deps.py Fri Oct 8 16:02:12 2004
@@ -24,7 +24,7 @@
from gump import log
from gump.core.gumpinit import gumpinit
from gump.test import getWorkedTestRun
-from gump.document.xdocs.documenter import XDocDocumenter
+from gump.actor.document.xdocs.documenter import XDocDocumenter
from gump.core.commandLine import handleArgv
from gump.core.run.gumprun import GumpRun
from gump.core.loader.loader import WorkspaceLoader
Modified: gump/branches/reorg/python/gump/tool/performance/gurus.py
==============================================================================
--- gump/branches/reorg/python/gump/tool/performance/gurus.py (original)
+++ gump/branches/reorg/python/gump/tool/performance/gurus.py Fri Oct 8 16:02:12 2004
@@ -53,11 +53,11 @@
# Load statistics for this workspace
- from gump.stats.statsdb import StatisticsDB
+ from gump.actor.stats.statsdb import StatisticsDB
db=StatisticsDB('test','test.db')
db.loadStatistics(workspace)
- from gump.document.xdocs.resolver import XDocResolver
+ from gump.actor.document.xdocs.resolver import XDocResolver
options.setResolver(XDocResolver('./test/bogus','http://bogus.org/'))
# The Run Details...
Modified: gump/branches/reorg/python/gump/tool/performance/xdocs.py
==============================================================================
--- gump/branches/reorg/python/gump/tool/performance/xdocs.py (original)
+++ gump/branches/reorg/python/gump/tool/performance/xdocs.py Fri Oct 8 16:02:12 2004
@@ -24,7 +24,7 @@
from gump import log
from gump.core.gumpinit import gumpinit
from gump.test import getWorkedTestRun
-from gump.document.xdocs.documenter import XDocDocumenter
+from gump.actor.document.xdocs.documenter import XDocDocumenter
from gump.core.commandLine import handleArgv
from gump.core.run.gumprun import GumpRun
from gump.core.loader.loader import WorkspaceLoader
@@ -59,11 +59,11 @@
workspace=WorkspaceLoader(options.isCache()).load(ws)
# Load statistics for this workspace
- from gump.stats.statsdb import StatisticsDB
+ from gump.actor.stats.statsdb import StatisticsDB
db=StatisticsDB('test','test.db')
db.loadStatistics(workspace)
- from gump.document.xdocs.resolver import XDocResolver
+ from gump.actor.document.xdocs.resolver import XDocResolver
options.setResolver(XDocResolver('./test/bogus','http://bogus.org/'))
# The Run Details...
Modified: gump/branches/reorg/python/tool/commitCheck.py
==============================================================================
--- gump/branches/reorg/python/tool/commitCheck.py (original)
+++ gump/branches/reorg/python/tool/commitCheck.py Fri Oct 8 16:02:12 2004
@@ -178,7 +178,7 @@
#try:
# # :TODO: PyChecker
# check=''
- # for m in ['gump','gump/document','gump.core.model']:
+ # for m in ['gump','gump.actor.document','gump.core.model']:
# if check: check += ' '
# mPath=os.path.join(absGumpPython,m)
# check += str(mPath)