ajack 2004/05/19 13:14:16
Modified: python/gump/build Tag: MultiRunner maven.py ant.py
builder.py
python/gump/syndication Tag: MultiRunner rss.py __init__.py
atom.py abstract.py
python/gump/document/xdocs Tag: MultiRunner documenter.py
resolver.py
python/gump/document/text Tag: MultiRunner documenter.py
python/gump/core Tag: MultiRunner gumprun.py actor.py
Log:
1) Test/Fix/Test/Fix...
2) Added some AL2.0 licenses.
Revision Changes Path
No revision
No revision
1.1.2.4 +25 -25 gump/python/gump/build/Attic/maven.py
Index: maven.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/maven.py,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- maven.py 19 May 2004 16:01:59 -0000 1.1.2.3
+++ maven.py 19 May 2004 20:14:15 -0000 1.1.2.4
@@ -55,26 +55,13 @@
def buildProject(self,project,stats):
workspace=self.run.getWorkspace()
-
- log.info(' Project: #[' + `project.getPosition()` + '] : ' +
project.getName())
-
- # Do this even if not ok
+
+ log.debug(' ------ Maven-ing: [' + `project.getPosition()` + '] ' +
project.getName())
+
self.performPreBuild(project, stats)
-
+
wasBuilt=0
- if project.okToPerformWork():
- log.debug(' ------ Building: [' + `projectNo` + '] ' +
project.getName())
-
- # Turn on --verbose or --debug if failing ...
- if stats:
- if (not STATE_SUCCESS == stats.currentState) and \
- not project.isVerboseOrDebug():
- if stats.sequenceInState > INSIGNIFICANT_DURATION:
- project.addInfo('Enable "debug" output, due to a sequence
of %s previous errors.' % stats.sequenceInState)
- project.setDebug(1)
- else:
- project.addInfo('Enable "verbose" output, due to %s
previous error(s).' % stats.sequenceInState)
- project.setVerbose(1)
+ if project.okToPerformWork():
#
# Get the appropriate build command...
@@ -95,13 +82,7 @@
reason=REASON_BUILD_FAILED
if cmdResult.state==CMD_STATE_TIMED_OUT:
reason=REASON_BUILD_TIMEDOUT
- project.changeState(STATE_FAILED,reason)
-
- if not project.isDebug():
- # Display...
- project.addInfo('Enable "debug" output, due to build
failure.')
- project.setDebug(1)
-
+ project.changeState(STATE_FAILED,reason)
else:
# For now, things are going good...
project.changeState(STATE_SUCCESS)
@@ -196,6 +177,25 @@
return cmd
+ # Do this even if not ok
+ def performPreBuild(self, project, stats):
+
+ # Maven requires a build.properties to be generated...
+ if project.okToPerformWork():
+ try:
+ propertiesFile=project.generateMavenProperties()
+ project.addDebug('Maven Properties in: ' + propertiesFile)
+
+ try:
+ catFileToFileHolder(project,propertiesFile, \
+ FILE_TYPE_CONFIG, \
+ os.path.basename(propertiesFile))
+ except:
+ log.error('Display Properties [ ' + propertiesFile + ']
Failed', exc_info=1)
+
+ except:
+ log.error('Generate Maven Properties Failed', exc_info=1)
+ project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
# The propertiesFile parameter is primarily for testing.
def generateMavenProperties(self,propertiesFile=None):
1.1.2.3 +1 -7 gump/python/gump/build/Attic/ant.py
Index: ant.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/ant.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ant.py 17 May 2004 21:41:22 -0000 1.1.2.2
+++ ant.py 19 May 2004 20:14:15 -0000 1.1.2.3
@@ -57,8 +57,7 @@
workspace=self.run.getWorkspace()
- log.info(' Project: #[' + `project.getPosition()` + '] : ' +
project.getName())
-
+ log.info(' Ant-ing: #[' + `project.getPosition()` + '] : ' +
project.getName())
#
# Get the appropriate build command...
@@ -80,11 +79,6 @@
if cmdResult.state==CMD_STATE_TIMED_OUT:
reason=REASON_BUILD_TIMEDOUT
project.changeState(STATE_FAILED,reason)
-
- if not project.isDebug():
- # Display...
- project.addInfo('Enable "debug" output, due to build failure.')
- project.setDebug(1)
else:
# For now, things are going good...
1.1.2.5 +9 -17 gump/python/gump/build/Attic/builder.py
Index: builder.py
===================================================================
RCS file: /home/cvs/gump/python/gump/build/Attic/builder.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- builder.py 19 May 2004 16:01:59 -0000 1.1.2.4
+++ builder.py 19 May 2004 20:14:15 -0000 1.1.2.5
@@ -170,6 +170,14 @@
self.ant.buildProject(project, stats)
if project.hasMaven():
self.maven.buildProject(project, stats)
+
+ # A build attempt was made...
+ wasBuilt=1
+
+ if not project.okToPerformWork() and not project.isDebug():
+ # Display...
+ project.addInfo('Enable "debug" output, due to build failure.')
+ project.setDebug(1)
# Do this even if not ok
self.performPostBuild( project, wasBuilt, stats )
@@ -272,23 +280,7 @@
except:
log.error('PerformMkdir Failed', exc_info=1)
project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
-
- # Maven requires a build.properties to be generated...
- if project.okToPerformWork() and project.hasMaven():
- try:
- propertiesFile=project.generateMavenProperties()
- project.addDebug('Maven Properties in: ' + propertiesFile)
-
- try:
- catFileToFileHolder(project,propertiesFile, \
- FILE_TYPE_CONFIG, \
- os.path.basename(propertiesFile))
- except:
- log.error('Display Properties [ ' + propertiesFile + ']
Failed', exc_info=1)
-
- except:
- log.error('Generate Maven Properties Failed', exc_info=1)
- project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
+
if startedOk and not project.okToPerformWork():
log.warn('Failed to perform pre-build on project [' + project.getName()
+ ']')
No revision
No revision
1.23.2.5 +15 -58 gump/python/gump/syndication/rss.py
Index: rss.py
===================================================================
RCS file: /home/cvs/gump/python/gump/syndication/rss.py,v
retrieving revision 1.23.2.4
retrieving revision 1.23.2.5
diff -u -r1.23.2.4 -r1.23.2.5
--- rss.py 18 May 2004 22:51:00 -0000 1.23.2.4
+++ rss.py 19 May 2004 20:14:15 -0000 1.23.2.5
@@ -1,62 +1,19 @@
-#!/usr/bin/env python
+#!/usr/bin/python
-# $Header$
-# $Revision$
-# $Date$
-#
-# ====================================================================
-#
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2003 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution, if
-# any, must include the following acknowlegement:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowlegement may appear in the software itself,
-# if and wherever such third-party acknowlegements normally appear.
-#
-# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
-# Foundation" must not be used to endorse or promote products derived
-# from this software without prior written permission. For written
-# permission, please contact [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache"
-# nor may "Apache" appear in their names without prior written
-# permission of the Apache Group.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
+
+# Copyright 2003-2004 The Apache Software Foundation
#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
+# 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.
"""
@@ -272,7 +229,7 @@
def syndicate(self):
# Main syndication document
- self.workspace=run.getWorkspace()
+ self.workspace=self.run.getWorkspace()
self.rssFile=self.run.getOptions().getResolver().getFile(self.workspace,'rss','.xml',1)
self.rssUrl=self.run.getOptions().getResolver().getUrl(self.workspace,'rss','.xml')
1.5.2.1 +15 -58 gump/python/gump/syndication/__init__.py
Index: __init__.py
===================================================================
RCS file: /home/cvs/gump/python/gump/syndication/__init__.py,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- __init__.py 9 Jan 2004 19:57:20 -0000 1.5
+++ __init__.py 19 May 2004 20:14:15 -0000 1.5.2.1
@@ -1,65 +1,22 @@
-#!/usr/bin/env python
+#!/usr/bin/python
-# $Header$
-# $Revision$
-# $Date$
-#
-# ====================================================================
-#
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2003 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution, if
-# any, must include the following acknowlegement:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowlegement may appear in the software itself,
-# if and wherever such third-party acknowlegements normally appear.
-#
-# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
-# Foundation" must not be used to endorse or promote products derived
-# from this software without prior written permission. For written
-# permission, please contact [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache"
-# nor may "Apache" appear in their names without prior written
-# permission of the Apache Group.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
+
+# Copyright 2003-2004 The Apache Software Foundation
#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
+# 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.
"""
- Highly experimental RSS feeds.
+ Highly experimental RSS|Atom feeds.
"""
import os
1.16.2.5 +14 -57 gump/python/gump/syndication/atom.py
Index: atom.py
===================================================================
RCS file: /home/cvs/gump/python/gump/syndication/atom.py,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -r1.16.2.4 -r1.16.2.5
--- atom.py 18 May 2004 22:51:00 -0000 1.16.2.4
+++ atom.py 19 May 2004 20:14:15 -0000 1.16.2.5
@@ -1,62 +1,19 @@
-#!/usr/bin/env python
+#!/usr/bin/python
-# $Header$
-# $Revision$
-# $Date$
-#
-# ====================================================================
-#
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2003 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution, if
-# any, must include the following acknowlegement:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowlegement may appear in the software itself,
-# if and wherever such third-party acknowlegements normally appear.
-#
-# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
-# Foundation" must not be used to endorse or promote products derived
-# from this software without prior written permission. For written
-# permission, please contact [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache"
-# nor may "Apache" appear in their names without prior written
-# permission of the Apache Group.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
+
+# Copyright 2003-2004 The Apache Software Foundation
#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
+# 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.
"""
Highly experimental Atom feeds.
1.1.2.5 +14 -57 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- abstract.py 19 May 2004 16:01:57 -0000 1.1.2.4
+++ abstract.py 19 May 2004 20:14:15 -0000 1.1.2.5
@@ -1,62 +1,19 @@
-#!/usr/bin/env python
+#!/usr/bin/python
-# $Header$
-# $Revision$
-# $Date$
-#
-# ====================================================================
-#
-# The Apache Software License, Version 1.1
-#
-# Copyright (c) 2003 The Apache Software Foundation. All rights
-# reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# 3. The end-user documentation included with the redistribution, if
-# any, must include the following acknowlegement:
-# "This product includes software developed by the
-# Apache Software Foundation (http://www.apache.org/)."
-# Alternately, this acknowlegement may appear in the software itself,
-# if and wherever such third-party acknowlegements normally appear.
-#
-# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
-# Foundation" must not be used to endorse or promote products derived
-# from this software without prior written permission. For written
-# permission, please contact [EMAIL PROTECTED]
-#
-# 5. Products derived from this software may not be called "Apache"
-# nor may "Apache" appear in their names without prior written
-# permission of the Apache Group.
-#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# ====================================================================
+
+# Copyright 2003-2004 The Apache Software Foundation
#
-# This software consists of voluntary contributions made by many
-# individuals on behalf of the Apache Software Foundation. For more
-# information on the Apache Software Foundation, please see
-# <http://www.apache.org/>.
+# 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.
"""
Highly experimental RSS feeds.
No revision
No revision
1.1.2.4 +112 -63 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- documenter.py 18 May 2004 22:37:30 -0000 1.1.2.3
+++ documenter.py 19 May 2004 20:14:16 -0000 1.1.2.4
@@ -116,9 +116,11 @@
runOptions=self.run.getOptions()
# Document...
+ self.documentRunDetails(workspace,gumpSet)
+ self.documentRunOptions(workspace)
self.documentEnvironment(workspace)
- self.documentWorkspace(workspace,gumpSet)
- self.documentRunOptions(workspace)
+ self.documentWorkspace(workspace)
+ self.documentEverythingElse(workspace,gumpSet)
# Document these (even if not a full build)
self.documentStatistics(workspace,gumpSet)
@@ -363,9 +365,9 @@
#####################################################################
#
- # Model Pieces
+ # Workspace Pieces
#
- def documentWorkspace(self,workspace,gumpSet):
+ def documentRunDetails(self,workspace,gumpSet):
#
@@ -374,21 +376,17 @@
# Index.xml
#
- document=XDocDocument('Workspace', \
- self.resolver.getFile(workspace))
+ document=XDocDocument('Gump Run', \
+ self.resolver.getFile(self.run))
- definitionSection=document.createSection('Workspace Definition')
+ definitionSection=document.createSection('Run Details')
definitionSection.createNote('This install runs Python Gump, not
Traditional Gump.')
definitionTable=definitionSection.createTable()
+ definitionTable.createEntry('Gump Run GUID', self.run.getRunGuid())
+ definitionTable.createEntry('Gump Run (Hex) GUID', self.run.getRunHexGuid())
definitionTable.createEntry('Gump Version', setting.version)
- if workspace.xml.description:
- definitionTable.createEntry('Description',
workspace.xml.description)
- if workspace.xml.version:
- definitionTable.createEntry('Workspace Version', workspace.xml.version)
- if not workspace.xml.version or not workspace.xml.version ==
setting.ws_version:
- definitionTable.createEntry('Gump Preferred Workspace Version',
setting.ws_version)
definitionTable.createEntry('Java Command',
self.run.getEnvironment().javaCommand)
definitionTable.createEntry('Python', str(sys.version))
definitionTable.createEntry('Operating System (Name)', str(os.name))
@@ -413,15 +411,6 @@
atomSyndRow.createData('Syndication')
atomSyndRow.createData().createFork('atom.xml','Atom')
- textRow=definitionTable.createRow()
- textRow.createData('Workspace Documentation')
- textRow.createData().createLink('context.html','Text')
-
- if not workspace.private:
- syndRow=definitionTable.createRow()
- syndRow.createData('Definition')
- syndRow.createData().createLink('workspace.html','XML')
-
if not gumpSet.isFull():
notice=definitionSection.createWarning()
@@ -440,49 +429,15 @@
self.documentSummary(document,workspace.getProjectSummary())
- self.documentAnnotations(document,workspace)
- #self.documentXML(document,workspace)
-
- detailsSection=document.createSection('Details')
-
- detailsTable=detailsSection.createTable()
- detailsTable.createEntry("State : ", workspace.getStateDescription())
-
- e = secsToElapsedTimeString(workspace.getElapsedSecs())
- if e : detailsTable.createEntry("Elapsed Time : ", e)
- detailsTable.createEntry("Base Directory : ", workspace.getBaseDirectory())
- detailsTable.createEntry("Temporary Directory : ", workspace.tmpdir)
- #if workspace.scratchdir:
- # detailsTable.createEntry("Scratch Directory : ",
workspace.scratchdir))
- # :TODO: We have duplicate dirs? tmp = scratch?
- detailsTable.createEntry("Log Directory : ", workspace.logdir)
- detailsTable.createEntry("Jars Repository : ", workspace.jardir)
- detailsTable.createEntry("CVS Directory : ", workspace.cvsdir)
- detailsTable.createEntry("Package Directory : ", workspace.pkgdir)
- if not workspace.private:
- detailsTable.createEntry("E-mail Server: ", workspace.mailserver)
- detailsTable.createEntry("E-mail Port: ", workspace.mailport)
- detailsTable.createEntry("List Address: ", workspace.mailinglist)
- detailsTable.createEntry("E-mail Address: ", workspace.email)
- detailsTable.createEntry("Prefix: ", workspace.prefix)
- detailsTable.createEntry("Signature: ", workspace.signature)
-
- self.documentProperties(detailsSection, workspace, 'Workspace Properties')
-
- # Does this workspace send notification (nag) mails?
- detailsTable.createEntry("Send Notification E-mails: ",
getBooleanString(workspace.isNotify()))
-
- #document.createRaw('<p><strong>Context Tree:</strong> <link
href=\'workspace.html\'>workspace</link></p>')
- # x.write('<p><strong>Workspace Config:</strong> <link
href=\'xml.txt\'>XML</link></p>')
- # x.write('<p><strong>RSS :</strong> <link href=\'index.rss\'>News
Feed</link></p>')
-
- self.documentFileList(document,workspace,'Workspace-level Files')
- self.documentWorkList(document,workspace,'Workspace-level Work')
-
- document.serialize()
+ self.documentAnnotations(document,self.run)
+
+ document.serialize()
document=None
+
+ def documentEverythingElse(self,workspace,gumpSet):
+
self.documentRepositories(workspace,gumpSet)
self.documentServers(workspace,gumpSet)
self.documentTrackers(workspace,gumpSet)
@@ -538,7 +493,100 @@
stream.seek(0)
document.createSource(stream.read())
stream.close()
- document.serialize()
+ document.serialize()
+
+ #####################################################################
+ #
+ # Workspace
+ #
+ def documentWorkspace(self,workspace):
+
+
+ #
+ # ----------------------------------------------------------------------
+ #
+ # Index.xml
+ #
+
+ document=XDocDocument('Workspace', \
+ self.resolver.getFile(workspace))
+
+ definitionSection=document.createSection('Workspace Definition')
+
+ definitionSection.createNote('This install runs Python Gump, not
Traditional Gump.')
+
+ definitionTable=definitionSection.createTable()
+ if workspace.xml.description:
+ definitionTable.createEntry('Description',
workspace.xml.description)
+ if workspace.xml.version:
+ definitionTable.createEntry('Workspace Version', workspace.xml.version)
+ if not workspace.xml.version or not workspace.xml.version ==
setting.ws_version:
+ definitionTable.createEntry('Gump Preferred Workspace Version',
setting.ws_version)
+ definitionTable.createEntry('@@DATE@@', str(default.date))
+ definitionTable.createEntry('Start Date/Time (UTC)',
workspace.getStartDateTimeUtc())
+ definitionTable.createEntry('Start Date/Time', workspace.getStartDateTime())
+ definitionTable.createEntry('Timezone', workspace.timezone)
+
+
+ rssSyndRow=definitionTable.createRow()
+ rssSyndRow.createData('Syndication')
+ rssSyndRow.createData().createFork('rss.xml','RSS')
+ atomSyndRow=definitionTable.createRow()
+ atomSyndRow.createData('Syndication')
+ atomSyndRow.createData().createFork('atom.xml','Atom')
+
+ textRow=definitionTable.createRow()
+ textRow.createData('Workspace Documentation')
+ textRow.createData().createLink('context.html','Text')
+
+ if not workspace.private:
+ syndRow=definitionTable.createRow()
+ syndRow.createData('Definition')
+ syndRow.createData().createLink('workspace.html','XML')
+
+ self.documentSummary(document,workspace.getProjectSummary())
+ self.documentAnnotations(document,workspace)
+ #self.documentXML(document,workspace)
+
+ detailsSection=document.createSection('Details')
+
+ detailsTable=detailsSection.createTable()
+ detailsTable.createEntry("State : ", workspace.getStateDescription())
+
+ e = secsToElapsedTimeString(workspace.getElapsedSecs())
+ if e : detailsTable.createEntry("Elapsed Time : ", e)
+ detailsTable.createEntry("Base Directory : ", workspace.getBaseDirectory())
+ detailsTable.createEntry("Temporary Directory : ", workspace.tmpdir)
+ #if workspace.scratchdir:
+ # detailsTable.createEntry("Scratch Directory : ",
workspace.scratchdir))
+ # :TODO: We have duplicate dirs? tmp = scratch?
+ detailsTable.createEntry("Log Directory : ", workspace.logdir)
+ detailsTable.createEntry("Jars Repository : ", workspace.jardir)
+ detailsTable.createEntry("CVS Directory : ", workspace.cvsdir)
+ detailsTable.createEntry("Package Directory : ", workspace.pkgdir)
+ if not workspace.private:
+ detailsTable.createEntry("E-mail Server: ", workspace.mailserver)
+ detailsTable.createEntry("E-mail Port: ", workspace.mailport)
+ detailsTable.createEntry("List Address: ", workspace.mailinglist)
+ detailsTable.createEntry("E-mail Address: ", workspace.email)
+ detailsTable.createEntry("Prefix: ", workspace.prefix)
+ detailsTable.createEntry("Signature: ", workspace.signature)
+
+ self.documentProperties(detailsSection, workspace, 'Workspace Properties')
+
+ # Does this workspace send notification (nag) mails?
+ detailsTable.createEntry("Send Notification E-mails: ",
getBooleanString(workspace.isNotify()))
+
+ #document.createRaw('<p><strong>Context Tree:</strong> <link
href=\'workspace.html\'>workspace</link></p>')
+ # x.write('<p><strong>Workspace Config:</strong> <link
href=\'xml.txt\'>XML</link></p>')
+ # x.write('<p><strong>RSS :</strong> <link href=\'index.rss\'>News
Feed</link></p>')
+
+ self.documentFileList(document,workspace,'Workspace-level Files')
+ self.documentWorkList(document,workspace,'Workspace-level Work')
+
+ document.serialize()
+ document=None
+
def documentRepositories(self,workspace,gumpSet):
@@ -571,6 +619,7 @@
if not rcount: reposTable.createLine('None')
document.serialize()
+ document=None
def documentServers(self,workspace,gumpSet):
1.1.2.4 +5 -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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- resolver.py 18 May 2004 22:37:30 -0000 1.1.2.3
+++ resolver.py 19 May 2004 20:14:16 -0000 1.1.2.4
@@ -32,6 +32,7 @@
from gump.utils.file import *
from gump.core.gumpenv import GumpEnvironment
+from gump.core.gumprun import GumpRun
from gump.model.repository import Repository
from gump.model.server import Server
@@ -54,7 +55,7 @@
visited.append(object)
# Determine Path
- if isinstance(object, Workspace):
+ if isinstance(object, Workspace) or isinstance(object, GumpRun):
path=Path()
elif isinstance(object, GumpEnvironment):
path=Path()
@@ -116,12 +117,14 @@
if not visited:visited=[]
visited.append(object)
- if isinstance(object, Workspace) \
+ if isinstance(object, GumpRun) \
or isinstance(object, Module) \
or isinstance(object, Project) \
or isinstance(object,StatisticsGuru) \
or isinstance(object,XRefGuru) :
document="index"+extn
+ elif isinstance(object, Workspace):
+ document="workspace"+extn
elif isinstance(object, GumpEnvironment):
document="environment"+extn
elif isinstance(object, Server) \
No revision
No revision
1.5.2.5 +1 -1 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.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- documenter.py 19 May 2004 18:42:28 -0000 1.5.2.4
+++ documenter.py 19 May 2004 20:14:16 -0000 1.5.2.5
@@ -56,7 +56,7 @@
def processProject(self,project):
verbose=self.run.getOptions().isVerbose()
debug=self.run.getOptions().isDebug()
- self.documentModule('',project,1,debug,verbose)
+ self.documentProject('',project,1,debug,verbose)
def documentRun(self):
No revision
No revision
1.5.2.5 +1 -1 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.4
retrieving revision 1.5.2.5
diff -u -r1.5.2.4 -r1.5.2.5
--- gumprun.py 18 May 2004 22:37:29 -0000 1.5.2.4
+++ gumprun.py 19 May 2004 20:14:16 -0000 1.5.2.5
@@ -544,7 +544,7 @@
self.actors=list()
def getRunGuid(self):
- return self.id
+ return self.guid
def getRunHexGuid(self):
return self.hexguid
1.1.2.3 +2 -2 gump/python/gump/core/Attic/actor.py
Index: actor.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/Attic/actor.py,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- actor.py 18 May 2004 22:37:29 -0000 1.1.2.2
+++ actor.py 19 May 2004 20:14:16 -0000 1.1.2.3
@@ -74,7 +74,7 @@
def _processEvent(self,event):
if not hasattr(self,'processEvent'): return
if not callable(self.processEvent): return
- log.debug('Process event [' + `event` + '] using [' + `self` + ']')
+ #log.debug('Process event [' + `event` + '] using [' + `self` + ']')
self.processEvent(event)
class AbstractRunActor(RunActor):
@@ -154,7 +154,7 @@
def _processOtherEvent(self,event):
if not hasattr(self,'processOtherEvent'): return
if not callable(self.processOtherEvent): return
- log.debug('Process Event [' + `event` + '] using [' + `self` + ']')
+ log.debug('Process (Other) Event [' + `event` + '] using [' + `self` + ']')
self.processOtherEvent(event)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
