ajack 2003/11/18 11:02:26
Modified: python/gump/model module.py property.py project.py
python/gump/test/resources/simple3 project4.xml
python/gump/test pyunit.py xml_tests.py model_tests.py
python/gump/output rss.py
Log:
Ongoing minor tweaks/fixes
Revision Changes Path
1.4 +4 -1 jakarta-gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/module.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- module.py 18 Nov 2003 17:29:17 -0000 1.3
+++ module.py 18 Nov 2003 19:02:25 -0000 1.4
@@ -91,8 +91,10 @@
root+='@'
if self.hostPrefix: root+=self.hostPrefix+'.'
root+=str(self.repository.getHostname()) + ':'
+
# :TODO: Allow users to override default port
- if str(self.repository.getMethod())=='pserver': root+='2401'
+ if str(self.repository.getMethod())=='pserver':
+ root+='2401'
root+=str(self.repository.getPath())
# If a subdirect
@@ -163,6 +165,7 @@
repo.addModule(self)
self.cvs=ModuleCVS(self.xml.cvs,repo)
else:
+ self.changeState(STATE_FAILED,REASON_CONFIG_FAILED)
log.error(':TODO: No such repository in w/s ['+ repoName +'] on [' \
+ self.getName() + ']')
1.3 +18 -19 jakarta-gump/python/gump/model/property.py
Index: property.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/property.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- property.py 18 Nov 2003 17:29:17 -0000 1.2
+++ property.py 18 Nov 2003 19:02:25 -0000 1.3
@@ -82,36 +82,37 @@
if self.isComplete(): return
if self.xml.reference=='home':
- try:
- targetProject=workspace.getProject(self.xml.project)
- self.setValue(targetProject.getHomeDirectory())
- except Exception, details:
- log.warn( "Cannot resolve homedir of " + self.xml.project + " for "
+ `parent` + ' : ' + `details`,exc_info=1)
+ if not workspace.hasProject(self.xml.project):
+ parent.addError('Cannot resolve homedir of *unknown* [' +
self.xml.project + ']')
+ else:
+
self.setValue(workspace.getProject(self.xml.project).getHomeDirectory())
+
elif self.xml.reference=='srcdir':
- try:
- targetProject=workspace.getProject(self.xml.project)
+ if not workspace.hasProject(self.xml.project):
+ parent.addError('Cannot resolve srcdir of *unknown* [' +
self.xml.project + ']')
+ else:
+
self.setValue(workspace.getProject(self.xml.project).getModule().getSourceDirectory())
- self.setValue(targetProject.getModule().getSourceDirectory())
- except Exception, details:
- log.warn( "Cannot resolve srcdir of " + self.xml.project + " for "
+ `parent` + ' : ' + `details`,exc_info=1)
- elif self.xml.reference=='jarpath' or self.xml.reference=='jar':
- try:
+ elif self.xml.reference=='jarpath' or self.xml.reference=='jar':
+ if not workspace.hasProject(self.xml.project):
+ parent.addError('Cannot resolve jar/jarpath of *unknown* [' +
self.xml.project + ']')
+ else:
targetProject=workspace.getProject(self.xml.project)
if self.xml.id:
for jar in targetProject.getJars():
if jar.id==self.xml.id:
if self.xml.reference=='jarpath':
- self.setValue(jar.path)
+ self.setValue(jar.getPath())
else:
- self.setValue(jar.name)
+ self.setValue(jar.getName())
break
else:
self.value=("jar with id %s was not found in project %s " +
"referenced by %s") % (self.xml.id,
targetProject.getName(), project.getName())
log.error(self.value)
elif targetProject.getJarCount()==1:
- self.value=targetProject.getJars()[0].path
+ self.value=targetProject.getJars()[0].getPath()
elif targetProject.getJarCount()>1:
self.value=("Multiple jars defined by project %s referenced by
%s; " + \
"an id attribute is required to select the one you want") %
\
@@ -120,10 +121,8 @@
else:
self.value=("Project %s referenced by %s defines no jars as
output") % \
(targetProject.getName(), project.getName())
- log.error(self.value)
- except Exception, details:
- log.warn( "Cannot resolve jar/jarpath of " + self.xml.project + \
- " for " + `parent` + ". Details: " + str(details),exc_info=1)
+ log.error(self.value)
+
elif self.xml.path:
#
# Path relative to module's srcdir
1.4 +2 -6 jakarta-gump/python/gump/model/project.py
Index: project.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.py 18 Nov 2003 17:29:17 -0000 1.3
+++ project.py 18 Nov 2003 19:02:25 -0000 1.4
@@ -412,11 +412,11 @@
for xmldepend in badDepends:
self.changeState(STATE_FAILED,REASON_CONFIG_FAILED)
self.addError("Bad Dependency. Project: " + xmldepend.project + "
unknown to *this* workspace")
- log.error("Unknown Dependency [" + xmldepend.project + "] on [" +
self.getName() + "]")
+ #log.error("Unknown Dependency [" + xmldepend.project + "] on [" +
self.getName() + "]")
for xmloption in badOptions:
self.addWarning("Bad *Optional* Dependency. Project: " +
xmloption.project + " unknown to *this* workspace")
- log.warn("Unknown *Optional* Dependency [" + xmloption.project + "]
on [" + self.getName() + "]")
+ #log.warn("Unknown *Optional* Dependency [" + xmloption.project +
"] on [" + self.getName() + "]")
self.setComplete(1)
@@ -438,8 +438,6 @@
if not dependency in dependProject.dependees:
dependProject.dependees.append(dependency)
else:
- # :TODO: Fail
- log.error("Unknown Project : " + dependProjectName )
badDepends.append(xmldepend)
# Walk the XML parts converting
@@ -458,8 +456,6 @@
if not dependency in optionProject.dependees:
optionProject.dependees.append(dependency)
else:
- # :TODO: Don't fail, just warn..
- log.warn( "Unknown Project : " + optionProjectName )
badOptions.append(xmloption)
1.3 +0 -1 jakarta-gump/python/gump/test/resources/simple3/project4.xml
Index: project4.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/resources/simple3/project4.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project4.xml 18 Nov 2003 17:29:18 -0000 1.2
+++ project4.xml 18 Nov 2003 19:02:25 -0000 1.3
@@ -12,7 +12,6 @@
<ant target="gump">
<property name="ant.home" reference="home" project="project1"/>
- <property name="ant.home" reference="home" project="ant"/>
</ant>
<depend project="project1"/>
1.2 +14 -5 jakarta-gump/python/gump/test/pyunit.py
Index: pyunit.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/pyunit.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pyunit.py 18 Nov 2003 17:29:18 -0000 1.1
+++ pyunit.py 18 Nov 2003 19:02:25 -0000 1.2
@@ -179,8 +179,8 @@
results=[]
- if hasattr(self,'setUp'):
- self.setUp()
+ if hasattr(self,'suiteSetUp'):
+ self.suiteSetUp()
# iterate over this suites properties
for name in self.__class__.__dict__:
@@ -197,17 +197,26 @@
try:
log.debug('Perform [' + self.getName() + '::' + \
name + ']')
+
+ if hasattr(self,'setUp'):
+ self.setUp()
+
test()
+
+
+ if hasattr(self,'tearDown'):
+ self.tearDown()
+
except Exception, details:
import traceback
ei = sys.exc_info()
message=formatException(ei)
del ei
results.append(Problem(self,name,message))
-
- if hasattr(self,'tearDown'):
- self.tearDown()
+ if hasattr(self,'suiteTearDown'):
+ self.suiteTearDown()
+
return results
1.2 +0 -1 jakarta-gump/python/gump/test/xml_tests.py
Index: xml_tests.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/xml_tests.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml_tests.py 17 Nov 2003 22:10:53 -0000 1.1
+++ xml_tests.py 18 Nov 2003 19:02:25 -0000 1.2
@@ -71,7 +71,6 @@
from gump.test import getTestWorkspace
-
if __name__=='__main__':
# init logging
1.3 +1 -1 jakarta-gump/python/gump/test/model_tests.py
Index: model_tests.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/test/model_tests.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- model_tests.py 18 Nov 2003 17:29:18 -0000 1.2
+++ model_tests.py 18 Nov 2003 19:02:25 -0000 1.3
@@ -76,7 +76,7 @@
def __init__(self):
UnitTestSuite.__init__(self)
- def setUp(self):
+ def suiteSetUp(self):
#
# Load a decent Workspace
#
1.4 +2 -2 jakarta-gump/python/gump/output/rss.py
Index: rss.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/output/rss.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rss.py 18 Nov 2003 04:00:22 -0000 1.3
+++ rss.py 18 Nov 2003 19:02:26 -0000 1.4
@@ -131,7 +131,7 @@
+ stateName(s.previousState) \
+ "\n\n"
- for note in pctxt.annotations:
+ for note in project.annotations:
content += (" - " + str(note) + "\n")
# write out the item to the rss feed
@@ -143,7 +143,7 @@
<dc:subject>%s</dc:subject>
<dc:date>%sT%s%s</dc:date>
</item>""" % \
- (pctxt.name,project.getStateDescriptionus(),datestr,
link, \
+
(project.getName(),project.getStateDescriptionus(),datestr, link, \
content, \
module.getName() + ":" + project.getName(), \
datestr,timestr,TZ))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
