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/01/08 18:58:52 UTC
cvs commit: jakarta-gump/python/gump/syndication atom.py
ajack 2004/01/08 09:58:52
Modified: python/gump/document resolver.py forrest.py
python/gump/syndication atom.py
Log:
1) Absolute URLs for Atom
2) Split project page into two (to try to separate out extra info,
to keep start to clean/focus pages)
Revision Changes Path
1.9 +2 -4 jakarta-gump/python/gump/document/resolver.py
Index: resolver.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/resolver.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- resolver.py 7 Dec 2003 17:49:13 -0000 1.8
+++ resolver.py 8 Jan 2004 17:58:51 -0000 1.9
@@ -360,8 +360,7 @@
self.makePath(location.getPath(),self.xdocsDir)
file=concatenate(self.xdocsDir,location.serialize())
- return file
-
+ return file
def getAbsoluteDirectoryUrl(self,object):
return concatenate(self.rootUrl,getPathForObject(object).serialize())
@@ -388,8 +387,7 @@
def getUrl(self,object,documentName=None,extn='.html'):
return self.getAbsoluteUrl(object,documentName,extn)
-
-
+
def getRootUrl(self):
return self.rootUrl
1.42 +24 -7 jakarta-gump/python/gump/document/forrest.py
Index: forrest.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- forrest.py 6 Jan 2004 21:35:46 -0000 1.41
+++ forrest.py 8 Jan 2004 17:58:51 -0000 1.42
@@ -267,10 +267,12 @@
definitionTable.createEntry('Start Date/Time', workspace.startdatetime)
definitionTable.createEntry('Timezone', workspace.timezone)
- syndRow=definitionTable.createRow()
- syndRow.createData('Syndication')
- syndRow.createData().createFork('index.rss','RSS')
- syndRow.createData().createFork('index.atom','Atom')
+ rssSyndRow=definitionTable.createRow()
+ rssSyndRow.createData('Syndication')
+ rssSyndRow.createData().createFork('index.rss','RSS')
+ atomSyndRow=definitionTable.createRow()
+ atomSyndRow.createData('Syndication')
+ atomSyndRow.createData().createFork('index.atom','Atom')
textRow=definitionTable.createRow()
textRow.createData('Workspace Documentation')
@@ -891,8 +893,7 @@
if project.isPackaged():
document.createNote('This is a packaged project, not Gumped.')
elif not project.hasBuildCommand():
- document.createNote('This project is not built by Gump.')
-
+ document.createNote('This project is not built by Gump.')
stateSection=document.createSection('State')
@@ -941,7 +942,23 @@
statsTable.createEntry("First Success: ", secsToDate(stats.first))
if stats.last:
statsTable.createEntry("Last Success: ", secsToDate(stats.last))
-
+
+
+ addnSection=document.createSection('Additional Details')
+ addnPara=addnSection.createParagraph()
+ addnPara.createLink( \
+ self.resolver.getUrl(project, \
+ project.getName() + '_details', \
+ '.xml'), \
+ 'For more...')
+
+
+ document.serialize()
+
+ document=XDocDocument('Project Details : ' + project.getName(), \
+ self.resolver.getFile(project, \
+ project.getName() + '_details', \
+ '.xml'))
self.documentProjectList(detailsSection, "Project Dependencies", \
project.getDependencies(), 0, project)
1.6 +3 -3 jakarta-gump/python/gump/syndication/atom.py
Index: atom.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/atom.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- atom.py 8 Jan 2004 01:28:11 -0000 1.5
+++ atom.py 8 Jan 2004 17:58:52 -0000 1.6
@@ -176,7 +176,7 @@
self.workspace=run.getWorkspace()
feedFile=self.run.getOptions().getResolver().getFile(self.workspace,'index','.atom')
- feedUrl=self.run.getOptions().getResolver().getUrl(self.workspace,'index','.atom')
+ feedUrl=self.run.getOptions().getResolver().getAbsoluteUrl(self.workspace,'index','.atom')
self.feed=AtomFeed(feedUrl,feedFile, \
'workspace', \
@@ -194,7 +194,7 @@
def syndicateModule(self,module,mainFeed):
feedFile=self.run.getOptions().getResolver().getFile(module,'index','.atom')
- feedUrl=self.run.getOptions().getResolver().getUrl(module,'index','.atom')
+ feedUrl=self.run.getOptions().getResolver().getAbsoluteUrl(module,'index','.atom')
moduleUrl=self.run.getOptions().getResolver().getUrl(module)
moduleFeed=AtomFeed(feedUrl,feedFile,
@@ -236,7 +236,7 @@
def syndicateProject(self,project,moduleFeed,mainFeed):
feedFile=self.run.getOptions().getResolver().getFile(project,project.getName(),'.atom')
- feedUrl=self.run.getOptions().getResolver().getUrl(project,'index','.atom')
+ feedUrl=self.run.getOptions().getResolver().getAbsoluteUrl(project,'index','.atom')
projectUrl=self.run.getOptions().getResolver().getUrl(project)
projectFeed=AtomFeed(feedUrl, feedFile, \