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/06/09 21:28:45 UTC
cvs commit: gump/python/gump/test/resources/full1 artifact_repository1.xml download1.xml profile.xml artefact_repository1.xml
ajack 2004/06/09 12:28:45
Modified: . Tag: CleanUp gumpy.py
python/gump/core Tag: CleanUp gumprun.py gumpinit.py
python/gump/model Tag: CleanUp module.py workspace.py
object.py property.py rawmodel.py repository.py
python/gump/utils Tag: CleanUp http.py work.py __init__.py
python/gump/test/resources/complete1 Tag: CleanUp
profile.xml download1.xml
python/gump/update Tag: CleanUp updater.py
python/gump/repository Tag: CleanUp artefact.py
python/gump/test/resources/full1 Tag: CleanUp download1.xml
profile.xml
Added: python/gump/utils Tag: CleanUp timing.py tasks.py
python/gump/test/resources/complete1 Tag: CleanUp
artifact_repository1.xml
python/gump/update Tag: CleanUp artifact.py
python/gump/loader Tag: CleanUp loader.py __init__.py
.cvsignore
python/gump/test/resources/full1 Tag: CleanUp
artifact_repository1.xml
Removed: python/gump/test/resources/complete1 Tag: CleanUp
artefact_repository1.xml
python/gump/update Tag: CleanUp artefact.py
python/gump/test/resources/full1 Tag: CleanUp
artefact_repository1.xml
Log:
Lightening commit...
1) Artefact -> Artifact
2) SAX/xmlutils -> DOM (start of)
3) Some work on tasks/timestamps
Revision Changes Path
No revision
No revision
1.37.2.1 +4 -1 gump/gumpy.py
Index: gumpy.py
===================================================================
RCS file: /home/cvs/gump/gumpy.py,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- gumpy.py 27 May 2004 14:35:28 -0000 1.37
+++ gumpy.py 9 Jun 2004 19:28:44 -0000 1.37.2.1
@@ -359,6 +359,8 @@
log.write('- GUMP mail to : ' + mailto + '\n')
if logurl:
log.write('- GUMP log is @ : ' + logurl + '\n')
+ if logdir:
+ log.write('- GUMP log is @ : ' + logdir + '\n')
#
# Add Gump to Python Path...
@@ -447,7 +449,8 @@
catFile(publishedLog, logFile, logTitle)
publishedLog.close()
published=1
- except:
+ except Exception, detauls:
+ print 'Failed to publish log file. ', str(details)
published=0
else:
print 'Unable to publish log file.'
No revision
No revision
1.9.2.2 +2 -2 gump/python/gump/core/gumprun.py
Index: gumprun.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- gumprun.py 8 Jun 2004 21:36:37 -0000 1.9.2.1
+++ gumprun.py 9 Jun 2004 19:28:44 -0000 1.9.2.2
@@ -616,8 +616,8 @@
#
# A repository interface...
#
- from gump.repository.artefact import ArtefactRepository
- self.outputsRepository=ArtefactRepository(workspace.jardir)
+ from gump.repository.artifact import ArtifactRepository
+ self.outputsRepository=ArtifactRepository(workspace.jardir)
# Generate a GUID (or close)
import md5
1.3.2.1 +3 -3 gump/python/gump/core/gumpinit.py
Index: gumpinit.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumpinit.py,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- gumpinit.py 21 May 2004 23:15:02 -0000 1.3
+++ gumpinit.py 9 Jun 2004 19:28:44 -0000 1.3.2.1
@@ -36,10 +36,10 @@
###############################################################################
# Initialize
###############################################################################
-def gumpinit():
+def gumpinit(level=None):
#set verbosity to show all messages of severity >= default.logLevel
- log.setLevel(default.logLevel)
+ log.setLevel(level or default.logLevel)
# Ensure dirs exists,
basicConfig()
No revision
No revision
1.45.2.2 +7 -7 gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/module.py,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -r1.45.2.1 -r1.45.2.2
--- module.py 8 Jun 2004 21:36:35 -0000 1.45.2.1
+++ module.py 9 Jun 2004 19:28:44 -0000 1.45.2.2
@@ -126,7 +126,7 @@
def getViewUrl(self):
return self.getRootUrl()
-class ModuleArtefacts(ModelObject):
+class ModuleArtifacts(ModelObject):
def __init__(self,xml,repository):
ModelObject.__init__(self,xml)
@@ -334,15 +334,15 @@
self.addError('No such repository in w/s ['+ str(repoName) +'] on [' \
+ self.getName() + ']')
- elif self.xml.artefacts:
- repoName=self.xml.artefacts.repository
+ elif self.xml.artifacts:
+ repoName=self.xml.artifacts.repository
if repoName:
if workspace.hasRepository(repoName):
# It references this repository...
repo=workspace.getRepository(repoName)
self.repository=repo
repo.addModule(self)
- self.artefacts=ModuleArtefacts(self.xml.artefacts,repo)
+ self.artifacts=ModuleArtifacts(self.xml.artifacts,repo)
else:
self.changeState(STATE_FAILED,REASON_CONFIG_FAILED)
self.addError('No such repository in w/s ['+ str(repoName) +'] on [' \
@@ -539,7 +539,7 @@
return 'http://cvs.apache.org/viewcvs.cgi/gump/' + location
def isUpdatable(self):
- return self.hasCvs() or self.hasSvn() or self.hasArtefacts()
+ return self.hasCvs() or self.hasSvn() or self.hasArtifacts()
def hasCvs(self):
if hasattr(self,'cvs') and self.cvs: return 1
@@ -549,8 +549,8 @@
if hasattr(self,'svn') and self.svn: return 1
return 0
- def hasArtefacts(self):
- if hasattr(self,'artefacts') and self.artefacts: return 1
+ def hasArtifacts(self):
+ if hasattr(self,'artifacts') and self.artifacts: return 1
return 0
# Where the contents (at the repository) Modified?
1.51.2.2 +28 -9 gump/python/gump/model/workspace.py
Index: workspace.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
retrieving revision 1.51.2.1
retrieving revision 1.51.2.2
diff -u -r1.51.2.1 -r1.51.2.2
--- workspace.py 8 Jun 2004 21:36:35 -0000 1.51.2.1
+++ workspace.py 9 Jun 2004 19:28:44 -0000 1.51.2.2
@@ -45,15 +45,10 @@
class Workspace(NamedModelObject, PropertyContainer, Statable, Resultable):
"""Gump Workspace"""
- def __init__(self,xmlworkspace):
-
- # Workspaces
- name='Unnamed'
- if xmlworkspace:
- if xmlworkspace.getName():
- name=xmlworkspace.getName()
-
- NamedModelObject.__init__(self,name,xmlworkspace)
+ def __init__(self,name,dom):
+
+ NamedModelObject.__init__(self,name,dom)
+
PropertyContainer.__init__(self)
Statable.__init__(self)
Resultable.__init__(self)
@@ -573,6 +568,30 @@
def getSourceControlStagingDirectory(self):
return self.cvsdir
+ def getObjectForTag(self,tag,name=None):
+ print "***************** Instantiate for ", tag, name
+
+ object=None
+
+ if 'profile' == tag:
+ if self.profiles.has_key(name):
+ object=self.profiles[name]
+ else:
+ object=Profile(name)
+ self.profiles[name]=object
+
+ # Who I am...
+ if object and hasattr(object,'setWorkspace'):
+ object.setWorkspace(self)
+
+ return object
+
+ #self.repositories={}
+ #self.modules={}
+ #self.projects={}
+ #self.profiles={}
+ #self.servers={}
+ #self.trackers={}
class WorkspaceStatistics(Statistics):
"""Statistics Holder"""
1.24.2.2 +13 -9 gump/python/gump/model/object.py
Index: object.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/object.py,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- object.py 8 Jun 2004 21:36:35 -0000 1.24.2.1
+++ object.py 9 Jun 2004 19:28:44 -0000 1.24.2.2
@@ -31,7 +31,7 @@
class ModelObject(Annotatable,Workable,FileHolder,Propogatable,Ownable):
"""Base model object for a single entity"""
- def __init__(self,xml,owner=None):
+ def __init__(self,dom,owner=None):
# Can scribble on this thing...
Annotatable.__init__(self)
@@ -49,10 +49,10 @@
Ownable.__init__(self,owner)
# The XML model
- self.xml=xml
+ self.dom=dom
- self.debug=None
- self.verbose=None
+ self.debug=False
+ self.verbose=False
self.completionPerformed=0
@@ -64,7 +64,7 @@
Ownable.__del__(self)
# No longer need this...
- self.xml=None
+ self.dom=None
def isComplete(self):
return self.completionPerformed
@@ -76,7 +76,7 @@
self.debug=debug
def isDebug(self):
- return self.debug or hasattr(self.xml,'debug')
+ return self.debug or hasattr(self.dom,'debug')
def setVerbose(self,verbose):
self.verbose=verbose
@@ -139,13 +139,17 @@
for object in self.getChildren():
object.aggregateStates(states)
- return states;
+ return states
+
+ def getObjectForTag(self,tag,name=None):
+ pass
+
class NamedModelObject(ModelObject):
"""Context for a single entity"""
- def __init__(self,name,xml,owner=None):
+ def __init__(self,name,dom,owner=None):
- ModelObject.__init__(self,xml,owner)
+ ModelObject.__init__(self,dom,owner)
# Named
self.name=name
1.22.2.2 +6 -7 gump/python/gump/model/property.py
Index: property.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/property.py,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- property.py 8 Jun 2004 21:36:35 -0000 1.22.2.1
+++ property.py 9 Jun 2004 19:28:44 -0000 1.22.2.2
@@ -160,8 +160,8 @@
return self.properties[name]
def hasProperties(self):
- if self.properties: return 1
- return 0
+ if self.properties: return True
+ return False
def getProperties(self):
return self.properties.values()
@@ -210,11 +210,10 @@
def importSysProperty(self,xmlproperty):
self.sysproperties.importProperty(xmlproperty)
- def importProperties(self,xml):
- """ Import all properties (from XML to model). """
- if hasattr(xml,'property'):
- for xmlproperty in xml.property:
- self.importProperty(xmlproperty)
+ def importProperties(self,dom):
+ """ Import all properties (from DOM to model). """
+ for element in dom.getElementsByName('property'):
+ self.importProperty(element)
if hasattr(xml,'sysproperty'):
for xmlproperty in xml.sysproperty:
1.21.4.2 +1 -1 gump/python/gump/model/rawmodel.py
Index: rawmodel.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/rawmodel.py,v
retrieving revision 1.21.4.1
retrieving revision 1.21.4.2
diff -u -r1.21.4.1 -r1.21.4.2
--- rawmodel.py 8 Jun 2004 21:36:35 -0000 1.21.4.1
+++ rawmodel.py 9 Jun 2004 19:28:44 -0000 1.21.4.2
@@ -97,7 +97,7 @@
def init(self):
self.cvs=Single(GumpXMLModelObject)
self.svn=Single(GumpXMLModelObject)
- self.artefacts=Single(GumpXMLModelObject)
+ self.artifacts=Single(GumpXMLModelObject)
self.url=Single(GumpXMLModelObject)
self.description=Single(GumpXMLModelObject)
self.redistributable=Single(GumpXMLModelObject)
1.11.4.2 +1 -1 gump/python/gump/model/repository.py
Index: repository.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/repository.py,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -u -r1.11.4.1 -r1.11.4.2
--- repository.py 8 Jun 2004 21:36:35 -0000 1.11.4.1
+++ repository.py 9 Jun 2004 19:28:44 -0000 1.11.4.2
@@ -49,7 +49,7 @@
else:
raise RuntimeError, 'No URL on SVN repository: ' + self.getName()
self.web=xml.transfer('web')
- elif 'artefact'==xml.type:
+ elif 'artifact'==xml.type:
self.type='Java Archives'
if hasattr(xml,'url'):
self.url=str(xml.url)
No revision
No revision
1.10.4.1 +1 -1 gump/python/gump/utils/http.py
Index: http.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/http.py,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- http.py 16 Apr 2004 17:28:37 -0000 1.10
+++ http.py 9 Jun 2004 19:28:44 -0000 1.10.4.1
@@ -51,7 +51,7 @@
###############################################################################
-def cacheHTTP(href,cacheDir=dir.cache,optimize=0):
+def cacheHTTP(href,cacheDir=dir.cache,optimize=False):
"""returns the path of the file in the href, cached if remote"""
#if its a local file get it locally
1.15.4.2 +1 -1 gump/python/gump/utils/work.py
Index: work.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/work.py,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.2
diff -u -r1.15.4.1 -r1.15.4.2
--- work.py 8 Jun 2004 21:36:36 -0000 1.15.4.1
+++ work.py 9 Jun 2004 19:28:44 -0000 1.15.4.2
@@ -220,7 +220,7 @@
self.worklist=WorkList(self)
def __del__(self):
- Stateful.__del__(self)
+ # No such @ present ... Stateful.__del__(self)
self.worklist=None
def getWorkList(self):
1.44.2.2 +4 -1 gump/python/gump/utils/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/__init__.py,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -r1.44.2.1 -r1.44.2.2
--- __init__.py 8 Jun 2004 21:36:36 -0000 1.44.2.1
+++ __init__.py 9 Jun 2004 19:28:44 -0000 1.44.2.2
@@ -174,7 +174,7 @@
def secsToElapsedTimeString(secs):
return elapsedTimeTripleToString(secsToElapsedTimeTriple(secs))
-def elapsedTimeTripleToString(elapsed):
+def elapsedTimeTripleToString(elapsed,noTimeText=None):
elapsedString=''
(hours,mins,secs) = elapsed
@@ -193,6 +193,9 @@
if elapsedString: elapsedString += ' '
elapsedString += str(secs)+' sec'
if secs > 1: elapsedString += 's'
+
+ if not elapsedString and noTimeText:
+ elapsedString=noTimeText
return elapsedString
No revision
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/__init__.py,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -r1.44.2.1 -r1.44.2.2
--- __init__.py 8 Jun 2004 21:36:36 -0000 1.44.2.1
+++ __init__.py 9 Jun 2004 19:28:44 -0000 1.44.2.2
@@ -174,7 +174,7 @@
def secsToElapsedTimeString(secs):
return elapsedTimeTripleToString(secsToElapsedTimeTriple(secs))
-def elapsedTimeTripleToString(elapsed):
+def elapsedTimeTripleToString(elapsed,noTimeText=None):
elapsedString=''
(hours,mins,secs) = elapsed
@@ -193,6 +193,9 @@
if elapsedString: elapsedString += ' '
elapsedString += str(secs)+' sec'
if secs > 1: elapsedString += 's'
+
+ if not elapsedString and noTimeText:
+ elapsedString=noTimeText
return elapsedString
No revision
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/__init__.py,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -r1.44.2.1 -r1.44.2.2
--- __init__.py 8 Jun 2004 21:36:36 -0000 1.44.2.1
+++ __init__.py 9 Jun 2004 19:28:44 -0000 1.44.2.2
@@ -174,7 +174,7 @@
def secsToElapsedTimeString(secs):
return elapsedTimeTripleToString(secsToElapsedTimeTriple(secs))
-def elapsedTimeTripleToString(elapsed):
+def elapsedTimeTripleToString(elapsed,noTimeText=None):
elapsedString=''
(hours,mins,secs) = elapsed
@@ -193,6 +193,9 @@
if elapsedString: elapsedString += ' '
elapsedString += str(secs)+' sec'
if secs > 1: elapsedString += 's'
+
+ if not elapsedString and noTimeText:
+ elapsedString=noTimeText
return elapsedString
1.1.2.1 +97 -0 gump/python/gump/utils/Attic/timing.py
1.1.2.1 +226 -0 gump/python/gump/utils/Attic/tasks.py
No revision
No revision
1.2.2.2 +1 -1 gump/python/gump/test/resources/complete1/profile.xml
Index: profile.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/profile.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- profile.xml 8 Jun 2004 21:36:36 -0000 1.2.2.1
+++ profile.xml 9 Jun 2004 19:28:45 -0000 1.2.2.2
@@ -26,7 +26,7 @@
<repository href="repository1.xml"/>
<repository href="svn_repository1.xml"/>
- <repository href="artefact_repository1.xml"/>
+ <repository href="artifact_repository1.xml"/>
<project name='package1' package='package1' />
1.2.2.2 +1 -1 gump/python/gump/test/resources/complete1/download1.xml
Index: download1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/download1.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- download1.xml 8 Jun 2004 21:36:36 -0000 1.2.2.1
+++ download1.xml 9 Jun 2004 19:28:45 -0000 1.2.2.2
@@ -5,7 +5,7 @@
Test of downloading a package
</description>
- <artefacts repository="artefact_repository1"/>
+ <artifacts repository="artifact_repository1"/>
<project name="download1">
<package>org.apache.download1</package>
No revision
Index: download1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/download1.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- download1.xml 8 Jun 2004 21:36:36 -0000 1.2.2.1
+++ download1.xml 9 Jun 2004 19:28:45 -0000 1.2.2.2
@@ -5,7 +5,7 @@
Test of downloading a package
</description>
- <artefacts repository="artefact_repository1"/>
+ <artifacts repository="artifact_repository1"/>
<project name="download1">
<package>org.apache.download1</package>
No revision
Index: download1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/complete1/download1.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- download1.xml 8 Jun 2004 21:36:36 -0000 1.2.2.1
+++ download1.xml 9 Jun 2004 19:28:45 -0000 1.2.2.2
@@ -5,7 +5,7 @@
Test of downloading a package
</description>
- <artefacts repository="artefact_repository1"/>
+ <artifacts repository="artifact_repository1"/>
<project name="download1">
<package>org.apache.download1</package>
1.1.2.1 +9 -0 gump/python/gump/test/resources/complete1/Attic/artifact_repository1.xml
No revision
No revision
1.3.2.2 +7 -7 gump/python/gump/update/updater.py
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/updater.py,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- updater.py 8 Jun 2004 21:36:37 -0000 1.3.2.1
+++ updater.py 9 Jun 2004 19:28:45 -0000 1.3.2.2
@@ -29,7 +29,7 @@
from gump.update.cvs import CvsUpdater
from gump.update.svn import SvnUpdater
-from gump.update.artefact import ArtefactUpdater
+from gump.update.artifact import ArtifactUpdater
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -57,7 +57,7 @@
self.cvs=CvsUpdater(run)
self.svn=SvnUpdater(run)
- self.artefact=ArtefactUpdater(run)
+ self.artifact=ArtifactUpdater(run)
"""
@@ -99,7 +99,7 @@
workspace = self.run.getWorkspace()
- log.debug("Workspace CVS|SVN|artefacts Directory: " + workspace.getSourceControlStagingDirectory())
+ log.debug("Workspace CVS|SVN|artifacts Directory: " + workspace.getSourceControlStagingDirectory())
# Update all the modules that have CVS repositories
for module in list:
@@ -125,8 +125,8 @@
ok=self.cvs.updateModule(module)
elif module.hasSvn():
ok=self.svn.updateModule(module)
- elif module.hasArtefacts():
- ok=self.artefact.updateModule(module)
+ elif module.hasArtifacts():
+ ok=self.artifact.updateModule(module)
else:
# :TODO: Now what?
pass
@@ -182,7 +182,7 @@
ok=self.cvs.preview(module)
elif module.hasSvn():
ok=self.svn.preview(module)
- elif module.hasArtefacts():
- ok=self.artefact.preview(module)
+ elif module.hasArtifacts():
+ ok=self.artifact.preview(module)
else:
print 'No updater for module: ' + module.getName()
No revision
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/updater.py,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- updater.py 8 Jun 2004 21:36:37 -0000 1.3.2.1
+++ updater.py 9 Jun 2004 19:28:45 -0000 1.3.2.2
@@ -29,7 +29,7 @@
from gump.update.cvs import CvsUpdater
from gump.update.svn import SvnUpdater
-from gump.update.artefact import ArtefactUpdater
+from gump.update.artifact import ArtifactUpdater
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -57,7 +57,7 @@
self.cvs=CvsUpdater(run)
self.svn=SvnUpdater(run)
- self.artefact=ArtefactUpdater(run)
+ self.artifact=ArtifactUpdater(run)
"""
@@ -99,7 +99,7 @@
workspace = self.run.getWorkspace()
- log.debug("Workspace CVS|SVN|artefacts Directory: " + workspace.getSourceControlStagingDirectory())
+ log.debug("Workspace CVS|SVN|artifacts Directory: " + workspace.getSourceControlStagingDirectory())
# Update all the modules that have CVS repositories
for module in list:
@@ -125,8 +125,8 @@
ok=self.cvs.updateModule(module)
elif module.hasSvn():
ok=self.svn.updateModule(module)
- elif module.hasArtefacts():
- ok=self.artefact.updateModule(module)
+ elif module.hasArtifacts():
+ ok=self.artifact.updateModule(module)
else:
# :TODO: Now what?
pass
@@ -182,7 +182,7 @@
ok=self.cvs.preview(module)
elif module.hasSvn():
ok=self.svn.preview(module)
- elif module.hasArtefacts():
- ok=self.artefact.preview(module)
+ elif module.hasArtifacts():
+ ok=self.artifact.preview(module)
else:
print 'No updater for module: ' + module.getName()
No revision
Index: updater.py
===================================================================
RCS file: /home/cvs/gump/python/gump/update/updater.py,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- updater.py 8 Jun 2004 21:36:37 -0000 1.3.2.1
+++ updater.py 9 Jun 2004 19:28:45 -0000 1.3.2.2
@@ -29,7 +29,7 @@
from gump.update.cvs import CvsUpdater
from gump.update.svn import SvnUpdater
-from gump.update.artefact import ArtefactUpdater
+from gump.update.artifact import ArtifactUpdater
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
@@ -57,7 +57,7 @@
self.cvs=CvsUpdater(run)
self.svn=SvnUpdater(run)
- self.artefact=ArtefactUpdater(run)
+ self.artifact=ArtifactUpdater(run)
"""
@@ -99,7 +99,7 @@
workspace = self.run.getWorkspace()
- log.debug("Workspace CVS|SVN|artefacts Directory: " + workspace.getSourceControlStagingDirectory())
+ log.debug("Workspace CVS|SVN|artifacts Directory: " + workspace.getSourceControlStagingDirectory())
# Update all the modules that have CVS repositories
for module in list:
@@ -125,8 +125,8 @@
ok=self.cvs.updateModule(module)
elif module.hasSvn():
ok=self.svn.updateModule(module)
- elif module.hasArtefacts():
- ok=self.artefact.updateModule(module)
+ elif module.hasArtifacts():
+ ok=self.artifact.updateModule(module)
else:
# :TODO: Now what?
pass
@@ -182,7 +182,7 @@
ok=self.cvs.preview(module)
elif module.hasSvn():
ok=self.svn.preview(module)
- elif module.hasArtefacts():
- ok=self.artefact.preview(module)
+ elif module.hasArtifacts():
+ ok=self.artifact.preview(module)
else:
print 'No updater for module: ' + module.getName()
1.1.2.1 +133 -0 gump/python/gump/update/Attic/artifact.py
No revision
No revision
1.1.2.1 +288 -0 gump/python/gump/loader/Attic/loader.py
1.1.2.1 +21 -0 gump/python/gump/loader/Attic/__init__.py
1.1.2.1 +1 -0 gump/python/gump/loader/Attic/.cvsignore
No revision
No revision
1.1.2.2 +6 -6 gump/python/gump/repository/Attic/artefact.py
Index: artefact.py
===================================================================
RCS file: /home/cvs/gump/python/gump/repository/Attic/artefact.py,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- artefact.py 8 Jun 2004 21:36:36 -0000 1.1.2.1
+++ artefact.py 9 Jun 2004 19:28:45 -0000 1.1.2.2
@@ -15,7 +15,7 @@
"""
- An Artefact Repository
+ An Artifact Repository
"""
@@ -28,7 +28,7 @@
from shutil import copyfile
-class ArtefactRepository:
+class ArtifactRepository:
"""Contains Repository Contents"""
def __init__(self,root):
self.root=root
@@ -63,16 +63,16 @@
if not os.path.exists(jdir): os.mkdir(jdir)
return jdir
- def publish(self,group,artefact):
+ def publish(self,group,artifact):
# Locate (and make if needed) group.
cdir=self.getGroupDir(group)
# Extract name, to make relative to group
- artefactName=os.path.basename(artefact)
- newArtefact=os.path.join(cdir,artefactName)
+ artifactName=os.path.basename(artifact)
+ newArtifact=os.path.join(cdir,artifactName)
# Do the transfer..
- copyfile(artefact,newArtefact)
+ copyfile(artifact,newArtifact)
No revision
No revision
1.5.4.2 +1 -1 gump/python/gump/test/resources/full1/download1.xml
Index: download1.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/full1/download1.xml,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- download1.xml 8 Jun 2004 21:36:37 -0000 1.5.4.1
+++ download1.xml 9 Jun 2004 19:28:45 -0000 1.5.4.2
@@ -5,7 +5,7 @@
Test of downloading a package
</description>
- <artefacts repository="artefact_repository1"/>
+ <artifacts repository="artifact_repository1"/>
<project name="download1">
<package>org.apache.download1</package>
1.10.4.2 +1 -1 gump/python/gump/test/resources/full1/profile.xml
Index: profile.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/full1/profile.xml,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- profile.xml 8 Jun 2004 21:36:37 -0000 1.10.4.1
+++ profile.xml 9 Jun 2004 19:28:45 -0000 1.10.4.2
@@ -26,7 +26,7 @@
<repository href="repository1.xml"/>
<repository href="svn_repository1.xml"/>
- <repository href="artefact_repository1.xml"/>
+ <repository href="artifact_repository1.xml"/>
<project name='package1' package='package1' />
No revision
Index: profile.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/full1/profile.xml,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- profile.xml 8 Jun 2004 21:36:37 -0000 1.10.4.1
+++ profile.xml 9 Jun 2004 19:28:45 -0000 1.10.4.2
@@ -26,7 +26,7 @@
<repository href="repository1.xml"/>
<repository href="svn_repository1.xml"/>
- <repository href="artefact_repository1.xml"/>
+ <repository href="artifact_repository1.xml"/>
<project name='package1' package='package1' />
No revision
Index: profile.xml
===================================================================
RCS file: /home/cvs/gump/python/gump/test/resources/full1/profile.xml,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -u -r1.10.4.1 -r1.10.4.2
--- profile.xml 8 Jun 2004 21:36:37 -0000 1.10.4.1
+++ profile.xml 9 Jun 2004 19:28:45 -0000 1.10.4.2
@@ -26,7 +26,7 @@
<repository href="repository1.xml"/>
<repository href="svn_repository1.xml"/>
- <repository href="artefact_repository1.xml"/>
+ <repository href="artifact_repository1.xml"/>
<project name='package1' package='package1' />
1.1.2.1 +9 -0 gump/python/gump/test/resources/full1/Attic/artifact_repository1.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org