svn commit: rev 43684 - gump/trunk/src/documentation/content/xdocs/metadata
Author: ajack Date: Fri Sep 10 11:56:54 2004 New Revision: 43684 Modified: gump/trunk/src/documentation/content/xdocs/metadata/repository.xml gump/trunk/src/documentation/content/xdocs/metadata/workspace.xml Log: Updated documentation, for workspace#database. Modified: gump/trunk/src/documentation/content/xdocs/metadata/repository.xml == --- gump/trunk/src/documentation/content/xdocs/metadata/repository.xml (original) +++ gump/trunk/src/documentation/content/xdocs/metadata/repository.xml Fri Sep 10 11:56:54 2004 @@ -1,180 +1,180 @@ - - - - - - - -Gump - - - - - repository -This represents the location from which modules can be obtained. - - - -Attribute -Description -Required? - - -name -Name by which this repository will be referenced by module - definitions. - -Yes - - -type -Type of repository. - cvs,svn,jars,p4 currently supported. - - -compress -Set the compression level. Some CVS client/server combinations - will not work with compression. -No, defaults to -z3. - - - - - - -Entity -Description -Required? - - -title -Descriptive name for the repository -No - - -home-page -Where to find out more information about the repository -No - - -cvsweb -Web interface to the repository. To be deprecated, see <web. -No - - -web -Web interface to the repository. (More appropriate for multiple types). -No - - -redistributable -Are the outputs of this build redistributable? -No - - - - - - CVS Usage - root - This is for type='cvs' only. - This specifies all of the elements which are combined to form - a CVSROOT. They are split out into separate entities so that each - can be individually overridden in a workspace definition. When an - entity is listed as required below, it means that when all of the - definitions are combined the entity must have a value - a workspace - or profile, for example, only needs to contain the values which it - overrides. - - - - Entity - Description - Required? - - - method - - Yes - - - user - - No - - - password - - No - - - hostname - - No - - - path - - Yes - - - - - - Perforce Usage - root - This is for type='p4' only. - This specifies all of the elements which are combined to communicate - with a Perforce server. They are split out into separate entities - so that each can be individually overridden in a workspace definition. - When an entity is listed as required below, it means that when all of - the definitions are combined the entity must have a value - a workspace - or profile, for example, only needs to contain the values which it - overrides. - - - - Entity - Description - Required? - - - clientspec - A Perforce clientspec is a set of mappings from server paths to local paths. The Perforce server keeps track of what files are "current" in a particular clientspec; as a result, a clientspec cannot be shared across Gump instances. It is recommended to set the allwrite option in the clientspec. - Yes - - - user - Defaults to user running Gump - No - - - password - - No - - - hostname - Defaults to perforce:1666 - No - - - - - - - + + + + + + + +Gump + + + + + repository +This represents the location from which modules can be obtained. + + + +Attribute +Description +Required? + + +name +Name by which this repository will be referenced by module + definitions. + +Yes + + +type +Type of repository. + cvs,svn,jars,p4 currently supported. + + +compress +Set the compression level. Some CVS client/server combinations + will not work with compressi
svn commit: rev 43420 - gump/trunk/python/gump/build
Author: ajack
Date: Mon Sep 6 10:59:44 2004
New Revision: 43420
Modified:
gump/trunk/python/gump/build/nant.py
Log:
Pass DEVPATH
Modified: gump/trunk/python/gump/build/nant.py
==
--- gump/trunk/python/gump/build/nant.py(original)
+++ gump/trunk/python/gump/build/nant.pyMon Sep 6 10:59:44 2004
@@ -121,7 +121,7 @@
# Run java on apache NAnt...
cmd=Cmd('NAnt.exe','build_'+project.getModule().getName()+'_'+project.getName(),
-basedir,{'LIBPATH':libpath})
+basedir,{'DEVPATH':libpath})
# Launch with specified framework (e.g. mono-1.0.1) if
# required.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 43349 - in gump/trunk/python/gump: build model
Author: ajack
Date: Sat Sep 4 12:11:14 2004
New Revision: 43349
Modified:
gump/trunk/python/gump/build/nant.py
gump/trunk/python/gump/model/workspace.py
Log:
Allow in the workspace.
Get's passed as -t:mono-1.0.1 to NAnt.
Modified: gump/trunk/python/gump/build/nant.py
==
--- gump/trunk/python/gump/build/nant.py(original)
+++ gump/trunk/python/gump/build/nant.pySat Sep 4 12:11:14 2004
@@ -119,16 +119,18 @@
# Library Path
libpath=languageHelper.getAssemblyPath(project)
-# Launch with mono if available
-exe=''
-if not self.run.getEnvironment().noMono:
-exe='mono '
-exe+='NAnt.exe'
-
# Run java on apache NAnt...
-cmd=Cmd(exe,'build_'+project.getModule().getName()+'_'+project.getName(),
+
cmd=Cmd('NAnt.exe','build_'+project.getModule().getName()+'_'+project.getName(),
basedir,{'LIBPATH':libpath})
-
+
+# Launch with specified framework (e.g. mono-1.0.1) if
+# required.
+workspace=self.run.getWorkspace()
+if workspace.hasDotNetInformation():
+dotnetInfo=workspace.getDotNetInformation()
+if dotnetInfo.hasFramework():
+cmd.addParameter('-t:',dotnetInfo.getFramework(),'')
+
# These are workspace + project system properties
cmd.addNamedParameters(sysproperties)
Modified: gump/trunk/python/gump/model/workspace.py
==
--- gump/trunk/python/gump/model/workspace.py (original)
+++ gump/trunk/python/gump/model/workspace.py Sat Sep 4 12:11:14 2004
@@ -64,6 +64,32 @@
def getUser(self): return self.user
def getPasswd(self): return self.passwd
def getDatabase(self): return self.database
+
+class DotNetInformation(ModelObject):
+def __init__(self,dom):
+ModelObject.__init__(self,dom)
+
+# Some defaults...
+self.framework=None
+
+def complete(self,workspace):
+if self.isComplete(): return
+
+# In case we care
+self.workspace=workspace
+
+# Import DOM attributes into self as attributes
+transferDomInfo(self.element, self, {})
+
+self.setComplete()
+
+def hasFramework(self):
+if self.framework: return True
+return False
+
+def getFramework(self):
+return self.framework
+
class Workspace(NamedModelObject, PropertyContainer, Statable, Resultable):
"""
@@ -99,10 +125,12 @@
# Database Informaton
self.dbInfo=None
+# DotNet Informaton
+self.dotnetInfo=None
+
# Where the merged XML was put
self.mergeFile=None
-
def getChildren(self):
return self.getModules()
@@ -217,6 +245,13 @@
def getDatabaseInformation(self):
return self.dbInfo
+def hasDotNetInformation(self):
+if self.dotnetInfo: return True
+return False
+
+def getDotNetInformation(self):
+return self.dotnetInfo
+
def isMultithreading(self):
return self.hasUpdaters() or self.hasBuilders()
@@ -338,6 +373,10 @@
if self.hasDomChild('database'):
self.dbInfo=DatabaseInformation(self.getDomChild('database'))
self.dbInfo.complete(self)
+
+if self.hasDomChild('dotnet'):
+self.dotnetInfo=DotNetInformation(self.getDomChild('dotnet'))
+self.dotnetInfo.complete(self)
# Complete the properies
self.completeProperties()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 43344 - in gump/trunk/python/gump: build model run test
Author: ajack
Date: Sat Sep 4 11:09:53 2004
New Revision: 43344
Modified:
gump/trunk/python/gump/build/nant.py
gump/trunk/python/gump/model/project.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/test/model.py
Log:
1) Added a check for Mono (to run NAnt)
2) A hasJars -> hasOutputs fix.
Modified: gump/trunk/python/gump/build/nant.py
==
--- gump/trunk/python/gump/build/nant.py(original)
+++ gump/trunk/python/gump/build/nant.pySat Sep 4 11:09:53 2004
@@ -118,9 +118,15 @@
# Library Path
libpath=languageHelper.getAssemblyPath(project)
+
+# Launch with mono if available
+exe=''
+if not self.run.getEnvironment().noMono:
+exe='mono '
+exe+='NAnt.exe'
# Run java on apache NAnt...
-
cmd=Cmd('NAnt.exe','build_'+project.getModule().getName()+'_'+project.getName(),
+cmd=Cmd(exe,'build_'+project.getModule().getName()+'_'+project.getName(),
basedir,{'LIBPATH':libpath})
# These are workspace + project system properties
Modified: gump/trunk/python/gump/model/project.py
==
--- gump/trunk/python/gump/model/project.py (original)
+++ gump/trunk/python/gump/model/project.py Sat Sep 4 11:09:53 2004
@@ -238,7 +238,7 @@
"""
Does this project generate outputs (currently JARs)
"""
-return self.hasJars() or self.hasLicense()
+return self.hasOutputs() or self.hasLicense()
def hasPackageNames(self):
if self.packageNames: return True
Modified: gump/trunk/python/gump/run/gumpenv.py
==
--- gump/trunk/python/gump/run/gumpenv.py (original)
+++ gump/trunk/python/gump/run/gumpenv.py Sat Sep 4 11:09:53 2004
@@ -69,6 +69,7 @@
self.checked=False
self.set=False
+self.noMono=False
self.noNAnt=False
self.noMaven=False
self.noDepot=False
@@ -188,6 +189,11 @@
not self._checkExecutable('NAnt','-help',False,False,'check_NAnt'):
self.noNAnt=True
self.addWarning('"NAnt" command not found, no NAnt builds')
+
+if not self.noMono and \
+not self._checkExecutable('mono','--help',False,False,'check_mono'):
+self.noMono=True
+self.addWarning('"Mono" command not found, no Mono runtime')
self.checked=True
Modified: gump/trunk/python/gump/test/model.py
==
--- gump/trunk/python/gump/test/model.py(original)
+++ gump/trunk/python/gump/test/model.pySat Sep 4 11:09:53 2004
@@ -80,7 +80,7 @@
self.assertTrue('Is a package marked', self.package1.isPackageMarked())
self.assertTrue('Is a package', self.package1.isPackaged())
-self.assertTrue('Has Jars', self.package1.hasJars())
+self.assertTrue('Has Outputs', self.package1.hasOutputs())
self.assertTrue('Is a package', self.packagedModule1.isPackaged())
def testNotifys(self):
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37494 - gump/trunk/python/gump/model
Author: ajack
Date: Fri Sep 3 10:41:04 2004
New Revision: 37494
Modified:
gump/trunk/python/gump/model/project.py
Log:
typo
Modified: gump/trunk/python/gump/model/project.py
==
--- gump/trunk/python/gump/model/project.py (original)
+++ gump/trunk/python/gump/model/project.py Fri Sep 3 10:41:04 2004
@@ -471,7 +471,7 @@
basename=os.path.basename(output.getPath())
newId=basename
# Strip off .jar or .lib (note: both same length)
-if newId.endswith('.jar') or newId.endsWith('.lib'):
+if newId.endswith('.jar') or newId.endswith('.lib'):
newId=newId[:-4]
# Strip off -@@DATE@@
datePostfix='-' + str(default.date_s)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37493 - in gump/trunk/python/gump: build document/xdocs guru language model repository run storage utils
Author: ajack
Date: Fri Sep 3 10:36:01 2004
New Revision: 37493
Modified:
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/build/nant.py
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/guru/xref.py
gump/trunk/python/gump/language/csharp.py
gump/trunk/python/gump/language/java.py
gump/trunk/python/gump/model/builder.py
gump/trunk/python/gump/model/depend.py
gump/trunk/python/gump/model/misc.py
gump/trunk/python/gump/model/project.py
gump/trunk/python/gump/model/property.py
gump/trunk/python/gump/model/workspace.py
gump/trunk/python/gump/repository/publisher.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/run/gumprun.py
gump/trunk/python/gump/storage/orphans.py
gump/trunk/python/gump/utils/domutils.py
Log:
Some NAnt work, renaming jars as outputs (since assemblies != jars)
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Fri Sep 3 10:36:01 2004
@@ -32,7 +32,7 @@
project work is done (based of 'stat's, so --debug can be set in
a series of failures)
- 3) Post build tasks (verifying jars exist, publishing to repositories,
+ 3) Post build tasks (verifying outputs exist, publishing to repositories,
etc).
"""
@@ -82,7 +82,7 @@
self.maven=MavenBuilder(run)
self.script=ScriptBuilder(run)
-# Place repository in jardir (to be renamed to repodir)
+# Place repository in repodir
self.repository=self.run.getOutputsRepository()
def buildProject(self,project):
@@ -250,24 +250,24 @@
No return.
"""
-log.debug(' -- Performing post-Build Actions (check jars) for : '+
project.getName())
+log.debug(' -- Performing post-Build Actions (check outputs) for : '+
project.getName())
if project.okToPerformWork():
-if project.hasOutputs():
+if project.hasAnyOutputs():
outputs = []
-# Ensure the jar output were all generated correctly.
+# Ensure the outputs were all generated correctly.
outputsOk=True
-for jar in project.getJars():
-jarPath=os.path.abspath(jar.getPath())
+for output in project.getOutputs():
+outputPath=os.path.abspath(output.getPath())
# Add to list of outputs, in case we
# fail to find, and need to go list
# directories
-outputs.append(jarPath)
-if not os.path.exists(jarPath):
+outputs.append(outputPath)
+if not os.path.exists(outputPath):
project.changeState(STATE_FAILED,REASON_MISSING_OUTPUTS)
outputsOk=False
-project.addError("Missing Output: " + str(jarPath))
+project.addError("Missing Output: " + str(outputPath))
if outputsOk:
# If we have a element
class Home(ModelObject): pass
-# represents a element
-class Jar(NamedModelObject):
+# represents an element
+class BaseOutput(NamedModelObject):
def __init__(self,name,dom,owner):
- NamedModelObject.__init__(self,name,dom,owner)
- self.id=''
- self.type=''
-
+NamedModelObject.__init__(self,name,dom,owner)
+self.id=''
+self.type=''
+
def setPath(self,path):
self.path=path
@@ -128,6 +128,15 @@
def getType(self):
return self.type
+
+# represents a element
+class Jar(BaseOutput):
+""" Represents a element."""
+pass
+
+class Assembly(BaseOutput):
+""" Represents an element."""
+pass
class Resolvable(ModelObject):
"""
Modified: gump/trunk/python/gump/model/project.py
==
--- gump/trunk/python/gump/model/project.py (original)
+++ gump/trunk/python/gump/model/project.py Fri Sep 3 10:36:01 2004
@@ -24,7 +24,8 @@
from gump.model.state import *
from gump.model.object import ModelObject, NamedModelObject
-from gump.model.misc import Jar,Resultable, Positioned, \
+from gump.model.misc import Jar, Assembly, BaseOutput, \
+Resultable, Positioned, \
cvs commit: gump/profile gump-n.xml
ajack 2004/09/03 10:33:30 Added: .gump-n.xml project nant.xml profile gump-n.xml Log: A parrallel nant workspace for DotNet stuff... Revision ChangesPath 1.1 gump/gump-n.xml Index: gump-n.xml === 1.1 gump/project/nant.xml Index: nant.xml === http://nant.sourceforge.net/"/> NAnt is a free .NET build tool. In theory it is kind of like make without make's wrinkles. In practice it's a lot like Ant. org.nant 1.1 gump/profile/gump-n.xml Index: gump-n.xml === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37388 - gump/trunk/python/gump/update
Author: ajack
Date: Thu Sep 2 08:27:08 2004
New Revision: 37388
Added:
gump/trunk/python/gump/update/p4.py
Log:
Complete Peter's patch.
Added: gump/trunk/python/gump/update/p4.py
==
--- (empty file)
+++ gump/trunk/python/gump/update/p4.py Thu Sep 2 08:27:08 2004
@@ -0,0 +1,208 @@
+#!/usr/bin/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.
+
+"""
+
+"""
+
+import os.path
+import sys
+from fnmatch import fnmatch
+
+from gump import log
+from gump.run.gumprun import *
+from gump.core.config import dir, default, basicConfig
+
+from gump.utils import dump, display, getIndent, logResourceUtilization, \
+invokeGarbageCollection
+from gump.utils.note import Annotatable
+from gump.utils.work import *
+
+from gump.utils.tools import *
+
+from gump.model.workspace import *
+from gump.model.module import Module
+from gump.model.project import Project
+from gump.model.depend import ProjectDependency
+from gump.model.stats import *
+from gump.model.state import *
+
+
+###
+# Classes
+###
+
+class P4Updater(RunSpecific):
+
+def __init__(self,run):
+RunSpecific.__init__(self,run)
+
+#
+# A stash of known logins.
+#
+#self.logins=readLogins()
+
+def updateModule(self,module):
+"""
+
+Perform a P4 sync on a module
+
+"""
+
+#log.info('Perform P4 Sync on #[' + `module.getPosition()` + \
+#'] : ' + module.getName())
+
+## Did we 'P4 checkout' already?
+exists = os.path.exists(module.getSourceControlStagingDirectory())
+
+# Doesn't tell us much...
+if exists:
+self.performStatus(module)
+
+self.performUpdate(module,exists)
+
+return module.okToPerformWork()
+
+def performStatus(self,module):
+# Get the Update Command
+(repository, root, cmd ) = self.getUpdateCommand(module, True, True)
+
+## Provide P4 logins, if not already there
+#loginToRepositoryOnDemand(repository,root,self.logins)
+
+# Execute the command and capture results
+cmdResult=execute(cmd, module.getWorkspace().tmpdir)
+
+#
+# Store this as work, on both the module and (cloned) on the repo
+#
+work=CommandWorkItem(WORK_TYPE_UPDATE,cmd,cmdResult)
+module.performedWork(work)
+
+if not cmdResult.isOk():
+log.error('Failed to checkout/update module: ' + module.name)
+
+def performUpdate(self,module,exists):
+"""
+Update this module (checking out if needed)
+"""
+# Get the Update Command
+(repository, root, cmd ) = self.getUpdateCommand(module, exists)
+
+#log.debug("P4 Sync Module " + module.getName() + \
+# ", Repository Name: " + str(module.repository.getName()))
+
+## Provide P4 logins, if not already there
+#loginToRepositoryOnDemand(repository,root,self.logins)
+
+# Execute the command and capture results
+cmdResult=execute(cmd, module.getWorkspace().tmpdir)
+
+#
+# Store this as work, on both the module and (cloned) on the repo
+#
+work=CommandWorkItem(WORK_TYPE_UPDATE,cmd,cmdResult)
+module.performedWork(work)
+repository.performedWork(work.clone())
+
+# Update Context w/ Results
+if not cmdResult.isOk():
+log.error('Failed w/ P4 Root ' + root + ' for %s on Repository %s.' \
+% (module.name, module.repository.getName()))
+if not exists:
+module.changeState(STATE_FAILED,REASON_UPDATE_FAILED)
+else:
+
svn commit: rev 37357 - in gump/trunk: python/gump/model python/gump/notify python/gump/repository python/gump/run python/gump/stats/dbm python/gump/test python/gump/update python/gump/utils src/documentation/content/xdocs/metadata test
Author: ajack
Date: Wed Sep 1 22:07:30 2004
New Revision: 37357
Modified:
gump/trunk/python/gump/model/module.py
gump/trunk/python/gump/model/repository.py
gump/trunk/python/gump/notify/notifier.py
gump/trunk/python/gump/repository/artifact.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/stats/dbm/statsdb.py
gump/trunk/python/gump/test/artifacts.py
gump/trunk/python/gump/update/updater.py
gump/trunk/python/gump/utils/smtp.py
gump/trunk/python/gump/utils/sync.py
gump/trunk/python/gump/utils/timing.py
gump/trunk/src/documentation/content/xdocs/metadata/module.xml
gump/trunk/src/documentation/content/xdocs/metadata/repository.xml
gump/trunk/test/gumptest.sh
Log:
Applied Peter Janes ([EMAIL PROTECTED]) Perforce addition, and other
fixes.
Modified: gump/trunk/python/gump/model/module.py
==
--- gump/trunk/python/gump/model/module.py (original)
+++ gump/trunk/python/gump/model/module.py Wed Sep 1 22:07:30 2004
@@ -129,6 +129,62 @@
def getViewUrl(self):
return self.getRootUrl()
+class ModuleP4(ModelObject):
+def __init__(self,dom,repository):
+ModelObject.__init__(self,dom)
+
+# Reference to the shared repository
+self.repository=repository
+self.hostname='perforce:1666'
+if repository.hasDomChild('root'):
+root=repository.getDomChild('root')
+self.method=getDomChildValue(root,'method')
+self.user=getDomChildValue(root,'user')
+self.password=getDomChildValue(root,'password')
+self.path=getDomChildValue(root,'path')
+self.hostname=getDomChildValue(root,'hostname')
+self.clientspec=getDomChildValue(root,'clientspec')
+
+self.tag=self.getDomAttributeValue('tag')
+
+# Extract settings
+self.dir=self.getDomAttributeValue('dir')
+
+def getPort(self):
+return str(self.hostname)
+
+def getUser(self):
+return str(self.user)
+
+def getPassword(self):
+return str(self.password)
+
+def getClientspec(self):
+return str(self.clientspec)
+
+def hasTag(self):
+if self.tag: return True
+return False
+
+def getTag(self):
+return str(self.tag)
+
+def getRootUrl(self):
+url=self.repository.getUrl()
+if self.hasDir():
+url+=self.getDir()
+return url
+
+def hasDir(self):
+if self.dir: return True
+return False
+
+def getDir(self):
+return self.dir
+
+def getViewUrl(self):
+return self.getRootUrl()
+
class ModuleArtifacts(ModelObject):
def __init__(self,dom,repository):
ModelObject.__init__(self,dom)
@@ -176,6 +232,7 @@
self.cvs=None
self.svn=None
self.artifacts=None
+ self.p4=None
self.packaged = False
self.redistributable= False
@@ -381,6 +438,21 @@
self.addError('No such repository ['+ str(repoName) +'] in
workspace on [' \
+ self.getName() + ']')
+elif self.hasDomChild('p4'):
+p4dom=self.getDomChild('p4')
+repoName=getDomAttributeValue(p4dom,'repository')
+if repoName:
+if workspace.hasRepository(repoName):
+# It references this repository
+repo=workspace.getRepository(repoName)
+self.repository=repo
+repo.addModule(self)
+self.p4=ModuleP4(p4dom,repo)
+else:
+self.changeState(STATE_FAILED,REASON_CONFIG_FAILED)
+self.addError('No such repository ['+ str(repoName) + '] in
workspace on [' \
++ self.getName() + ']')
+
elif self.hasDomChild('artifacts'):
adom=self.getDomChild('artifacts')
repoName=getDomAttributeValue(adom,'repository')
@@ -640,6 +712,10 @@
if self.svn: return True
return False
+def hasP4(self):
+if self.p4: return True
+return False
+
def hasArtifacts(self):
if self.artifacts: return True
return False
@@ -669,6 +745,8 @@
return self.cvs.getViewUrl()
elif self.hasSvn():
return self.svn.getViewUrl()
+elif self.hasP4():
+return self.p4.getViewUrl()
class ModuleStatistics(St
svn commit: rev 37345 - in gump/trunk/python/gump: build document/xdocs language model run runner test test/resources/full1
Author: ajack
Date: Wed Sep 1 11:59:27 2004
New Revision: 37345
Added:
gump/trunk/python/gump/language/csharp.py
gump/trunk/python/gump/language/path.py
- copied unchanged from rev 37254, gump/trunk/python/gump/language/cp.py
gump/trunk/python/gump/test/nant.py
gump/trunk/python/gump/test/resources/full1/nant1.xml
Removed:
gump/trunk/python/gump/language/cp.py
Modified:
gump/trunk/python/gump/build/ant.py
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/build/maven.py
gump/trunk/python/gump/build/nant.py
gump/trunk/python/gump/build/script.py
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/language/java.py
gump/trunk/python/gump/model/builder.py
gump/trunk/python/gump/model/project.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/run/gumprun.py
gump/trunk/python/gump/runner/runner.py
gump/trunk/python/gump/test/model.py
gump/trunk/python/gump/test/pyunit.py
gump/trunk/python/gump/test/resources/full1/profile.xml
Log:
Some more NAnt work (but also trying to put TRUNK back into one piece.)
Modified: gump/trunk/python/gump/build/ant.py
==
--- gump/trunk/python/gump/build/ant.py (original)
+++ gump/trunk/python/gump/build/ant.py Wed Sep 1 11:59:27 2004
@@ -32,8 +32,6 @@
from gump.run.gumprun import *
from gump.core.config import dir, default, basicConfig
-import gump.build.builder
-
from gump.utils.note import Annotatable
from gump.utils.work import *
@@ -76,7 +74,7 @@
# Update context with the fact that this work was done
work=CommandWorkItem(WORK_TYPE_BUILD,cmd,cmdResult)
project.performedWork(work)
-project.setBuilt(1)
+project.setBuilt(True)
# Update context state based of the result
if not cmdResult.state==CMD_STATE_SUCCESS:
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Wed Sep 1 11:59:27 2004
@@ -97,8 +97,7 @@
log.info('Build Project: #[' + `project.getPosition()` + '] : ' +
project.getName() + ' : [state:' \
+ project.getStateDescription() + ']')
-# Right now everything is Java..
-languageHelper=self.run.getJavaHelper()
+languageHelper=self.run.getLanguageHelper(project.getLanguageType())
# Extract stats (in case we want to do conditional processing)
stats=None
Modified: gump/trunk/python/gump/build/maven.py
==
--- gump/trunk/python/gump/build/maven.py (original)
+++ gump/trunk/python/gump/build/maven.py Wed Sep 1 11:59:27 2004
@@ -32,8 +32,6 @@
from gump.run.gumprun import *
from gump.core.config import dir, default, basicConfig
-import gump.build
-
from gump.utils import dump, display, getIndent, logResourceUtilization, \
invokeGarbageCollection
from gump.utils.note import Annotatable
Modified: gump/trunk/python/gump/build/nant.py
==
--- gump/trunk/python/gump/build/nant.py(original)
+++ gump/trunk/python/gump/build/nant.pyWed Sep 1 11:59:27 2004
@@ -32,8 +32,6 @@
from gump.run.gumprun import *
from gump.core.config import dir, default, basicConfig
-import gump.build.builder
-
from gump.utils.note import Annotatable
from gump.utils.work import *
@@ -67,7 +65,7 @@
log.info('Run NAnt on Project: #[' + `project.getPosition()` + '] : ' +
project.getName())
# Get the appropriate build command...
-cmd=self.getNAntCommand(project, language,
self.run.getEnvironment().getJavaCommand())
+cmd=self.getNAntCommand(project, language)
if cmd:
# Execute the command
@@ -76,7 +74,7 @@
# Update context with the fact that this work was done
work=CommandWorkItem(WORK_TYPE_BUILD,cmd,cmdResult)
project.performedWork(work)
-project.setBuilt(1)
+project.setBuilt(True)
# Update context state based of the result
if not cmdResult.state==CMD_STATE_SUCCESS:
@@ -88,7 +86,7 @@
# For now, things are going good...
project.changeState(STATE_SUCCESS)
-def getNAntCommand(self,project,language):
+def getNAntCommand(self,project,languageHelper):
"""
Build an ANT command for this project, based on the http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless requir
svn commit: rev 37254 - in gump/trunk/python: . gump/build gump/document/xdocs gump/java gump/language gump/model gump/run gump/runner gump/test
Author: ajack
Date: Tue Aug 31 08:33:05 2004
New Revision: 37254
Added:
gump/trunk/python/gump/build/nant.py
gump/trunk/python/gump/language/
- copied from rev 37209, gump/trunk/python/gump/java/
gump/trunk/python/gump/language/__init__.py
- copied unchanged from rev 37253, gump/trunk/python/gump/java/__init__.py
gump/trunk/python/gump/language/cp.py
- copied, changed from rev 37253, gump/trunk/python/gump/java/cp.py
gump/trunk/python/gump/language/java.py
- copied, changed from rev 37209, gump/trunk/python/gump/java/helper.py
Removed:
gump/trunk/python/gump/java/
gump/trunk/python/gump/language/helper.py
Modified:
gump/trunk/python/ (props changed)
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/build/maven.py
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/document/xdocs/resolver.py
gump/trunk/python/gump/model/builder.py
gump/trunk/python/gump/model/project.py
gump/trunk/python/gump/run/gumprun.py
gump/trunk/python/gump/runner/runner.py
gump/trunk/python/gump/test/language.py
gump/trunk/python/gump/test/maven.py
Log:
Partial NAnt commit, performed 'cos SVN disallows a dir rename followed by a file
rename without a commit in between.
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Tue Aug 31 08:33:05 2004
@@ -47,6 +47,7 @@
from gump.build.script import ScriptBuilder
from gump.build.ant import AntBuilder
+from gump.build.nant import NAntBuilder
from gump.build.maven import MavenBuilder
from gump.utils import dump, display, getIndent, logResourceUtilization, \
@@ -66,8 +67,6 @@
import gump.integration.depot
-import gump.java.helper
-
###
# Classes
@@ -79,6 +78,7 @@
gump.run.gumprun.RunSpecific.__init__(self,run)
self.ant=AntBuilder(run)
+self.nant=NAntBuilder(run)
self.maven=MavenBuilder(run)
self.script=ScriptBuilder(run)
@@ -134,6 +134,8 @@
self.script.buildProject(project, languageHelper, stats)
elif project.hasAnt():
self.ant.buildProject(project, languageHelper, stats)
+elif project.hasNAnt():
+self.nant.buildProject(project, languageHelper, stats)
elif project.hasMaven():
self.maven.buildProject(project, languageHelper, stats)
@@ -495,6 +497,8 @@
self.script.preview(project, languageHelper, stats)
elif project.hasAnt():
self.ant.preview(project, languageHelper, stats)
+elif project.hasNAnt():
+self.nant.preview(project, languageHelper, stats)
elif project.hasMaven():
self.maven.preview(project, languageHelper, stats)
else:
Modified: gump/trunk/python/gump/build/maven.py
==
--- gump/trunk/python/gump/build/maven.py (original)
+++ gump/trunk/python/gump/build/maven.py Tue Aug 31 08:33:05 2004
@@ -252,7 +252,7 @@
# :TODO: write...
for annotatedPath in classpath.getPathParts():
-if isinstance(annotatedPath,gump.java.cp.AnnotatedPath):
+if isinstance(annotatedPath,gump.language.path.AnnotatedPath):
props.write(('# Contributor: %s\nmaven.jar.%s=%s\n') % \
( annotatedPath.getContributor(),
annotatedPath.getId(),
Added: gump/trunk/python/gump/build/nant.py
==
--- (empty file)
+++ gump/trunk/python/gump/build/nant.pyTue Aug 31 08:33:05 2004
@@ -0,0 +1,187 @@
+#!/usr/bin/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";
+
+
+"""
+ A NAnt bu
cvs commit: gump/profile gump.xml
ajack 2004/08/31 07:39:12 Modified:profile gump.xml Log: Updates JSCH to .16 Revision ChangesPath 1.392 +1 -1 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.391 retrieving revision 1.392 diff -u -r1.391 -r1.392 --- gump.xml 31 Aug 2004 03:47:13 - 1.391 +++ gump.xml 31 Aug 2004 14:39:11 - 1.392 @@ -330,7 +330,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/08/30 20:47:13 Modified:profile gump.xml Added: project jena.xml icu4j.xml Log: Tinkering with RDF... Revision ChangesPath 1.1 gump/project/jena.xml Index: jena.xml === http://jena.sourceforge.net/index.html"/> Jena is a Java framework for building Semantic Web applications. It provides a programmatic environment for RDF, RDFS and OWL, including a rule-based inference engine. com.hp.hpl.jena 1.1 gump/project/icu4j.xml Index: icu4j.xml === http://oss.software.ibm.com/developerworks/projects/icu4j"/> UDDI client org.icu4j 1.391 +2 -0 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- gump.xml 26 Aug 2004 16:42:12 - 1.390 +++ gump.xml 31 Aug 2004 03:47:13 - 1.391 @@ -228,10 +228,12 @@ http://dev.w3.org/cvsweb/~checkout~/2001/DOM-Test-Suite/domts.xml?content-type=text/xml"/> + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37225 - in gump/live: psp python/gump/build python/gump/document/xdocs python/gump/rdf python/gump/run python/gump/runner python/gump/syndication python/gump/test
Author: ajack
Date: Mon Aug 30 16:57:49 2004
New Revision: 37225
Added:
gump/live/psp/
- copied from rev 37210, gump/trunk/psp/
gump/live/psp/index.html
- copied unchanged from rev 37210, gump/trunk/psp/index.html
gump/live/psp/test.psp
- copied unchanged from rev 37210, gump/trunk/psp/test.psp
gump/live/python/gump/rdf/ (props changed)
- copied from rev 37210, gump/trunk/python/gump/rdf/
gump/live/python/gump/rdf/__init__.py
- copied unchanged from rev 37210, gump/trunk/python/gump/rdf/__init__.py
gump/live/python/gump/rdf/describer.py
- copied unchanged from rev 37210, gump/trunk/python/gump/rdf/describer.py
gump/live/python/gump/test/describer.py
- copied unchanged from rev 37210, gump/trunk/python/gump/test/describer.py
Modified:
gump/live/python/gump/build/builder.py
gump/live/python/gump/document/xdocs/documenter.py
gump/live/python/gump/run/options.py
gump/live/python/gump/runner/runner.py
gump/live/python/gump/syndication/atom.py
gump/live/python/gump/syndication/rss.py
gump/live/python/gump/test/pyunit.py
Log:
Fixing stats updating for live.
Modified: gump/live/python/gump/build/builder.py
==
--- gump/live/python/gump/build/builder.py (original)
+++ gump/live/python/gump/build/builder.py Mon Aug 30 16:57:49 2004
@@ -115,6 +115,9 @@
if project.okToPerformWork():
log.debug('Performing Build Upon: [' + `project.getPosition()` + '] '
+ project.getName())
+if project.isPrereqFailed():
+project.addWarning('Building despite certain prerequisite
failures [repository build].')
+
# Turn on --verbose or --debug if failing ...
#if stats:
#if (not STATE_SUCCESS == stats.currentState) and \
Modified: gump/live/python/gump/document/xdocs/documenter.py
==
--- gump/live/python/gump/document/xdocs/documenter.py (original)
+++ gump/live/python/gump/document/xdocs/documenter.py Mon Aug 30 16:57:49 2004
@@ -293,6 +293,14 @@
atomArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + atomUrl) \
.createIcon(self.resolver.getImageUrl('valid-atom.png'), alt='[Valid
Atom]') #, title='Validate my Atom feed', width='88', height='31')
+rdfSyndRow=definitionTable.createRow()
+rdfSyndRow.createData().createStrong('Metadata')
+rdfArea=rdfSyndRow.createData()
+rdfArea.createFork('gump.rdf','RDF')
+#rdfUrl=self.resolver.getUrl(self.workspace,'gump','.rdf')
+#rdfArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + rdfUrl) \
+#.createIcon(self.resolver.getImageUrl('valid-rdf.png'), alt='[Valid
Atom]') #, title='Validate my Atom feed', width='88', height='31')
+
self.documentSummary(document,self.workspace.getProjectSummary())
dtSection=definitionSection.createSection('Dates/Times')
Modified: gump/live/python/gump/run/options.py
==
--- gump/live/python/gump/run/options.py(original)
+++ gump/live/python/gump/run/options.pyMon Aug 30 16:57:49 2004
@@ -62,13 +62,14 @@
FEATURE_NOTIFY=0x04
FEATURE_DIAGRAM=0x08
FEATURE_SYNDICATE=0x10
-FEATURE_PUBLISH=0x20
-FEATURE_DOCUMENT=0x40
+FEATURE_DESCRIBE=0x20
+FEATURE_PUBLISH=0x40
+FEATURE_DOCUMENT=0x80
-FEATURE_DEFAULT=FEATURE_SYNDICATE|FEATURE_DOCUMENT|FEATURE_NOTIFY
+FEATURE_DEFAULT=FEATURE_STATISTICS|FEATURE_SYNDICATE|FEATURE_DESCRIBE|FEATURE_DOCUMENT|FEATURE_NOTIFY
FEATURE_ALL=FEATURE_STATISTICS|FEATURE_RESULTS|FEATURE_NOTIFY|FEATURE_DIAGRAM|\
-FEATURE_SYNDICATE|FEATURE_PUBLISH|FEATURE_DOCUMENT
+FEATURE_SYNDICATE|FEATURE_DESCRIBE|FEATURE_PUBLISH|FEATURE_DOCUMENT
FEATURE_OFFICIAL=FEATURE_ALL
@@ -286,6 +287,12 @@
Is syndication (RSS|Atom) to be performed for this run?
"""
return self._testFeatureIsSet(FEATURE_SYNDICATE)
+
+def isDescribe(self):
+"""
+Is describer (RDF) to be performed for this run?
+"""
+return self._testFeatureIsSet(FEATURE_DESCRIBE)
def isPublish(self):
"""
Modified: gump/live/python/gump/runner/runner.py
==
--- gump/live/python/gump/runner/runner.py (original)
+++ gump/live/python/gump/runn
svn commit: rev 37172 - gump/trunk/python/gump/document/xdocs
Author: ajack
Date: Sun Aug 29 05:29:49 2004
New Revision: 37172
Modified:
gump/trunk/python/gump/document/xdocs/documenter.py
Log:
Attempt to fix cut-n-paste error...
Modified: gump/trunk/python/gump/document/xdocs/documenter.py
==
--- gump/trunk/python/gump/document/xdocs/documenter.py (original)
+++ gump/trunk/python/gump/document/xdocs/documenter.py Sun Aug 29 05:29:49 2004
@@ -296,8 +296,8 @@
rdfSyndRow=definitionTable.createRow()
rdfSyndRow.createData().createStrong('Metadata')
rdfArea=rdfSyndRow.createData()
-rdfArea.createFork('atom.rdf','RDF')
-rdfUrl=self.resolver.getUrl(self.workspace,'gump','.rdf')
+rdfArea.createFork('gump.rdf','RDF')
+#rdfUrl=self.resolver.getUrl(self.workspace,'gump','.rdf')
#rdfArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + rdfUrl) \
#.createIcon(self.resolver.getImageUrl('valid-rdf.png'), alt='[Valid
Atom]') #, title='Validate my Atom feed', width='88', height='31')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37126 - gump/trunk/python/gump/rdf
Author: ajack Date: Fri Aug 27 10:13:57 2004 New Revision: 37126 Modified: gump/trunk/python/gump/rdf/describer.py Log: Cope w/ None repo for RDF. Modified: gump/trunk/python/gump/rdf/describer.py == --- gump/trunk/python/gump/rdf/describer.py (original) +++ gump/trunk/python/gump/rdf/describer.py Fri Aug 27 10:13:57 2004 @@ -164,12 +164,15 @@ Literal(project.getName()), 'Named') -# With a repository... -self.addTriple( store, -pSubject, -RDFDescriber.GUMP_NS["residesWithin"], -self.createURIRef(project.getModule().getRepository()), -'Resides within') +# Within a repository... + +# :TODO: Why can this return None? +if project.getModule().hasRepository(): +self.addTriple( store, +pSubject, +RDFDescriber.GUMP_NS["residesWithin"], +self.createURIRef(project.getModule().getRepository()), +'Resides within') # Describe dependencies... for dependency in project.getDirectDependencies(): - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37108 - gump/trunk/psp
Author: ajack Date: Thu Aug 26 20:47:32 2004 New Revision: 37108 Added: gump/trunk/psp/index.html Log: trouble in config land. Added: gump/trunk/psp/index.html == --- (empty file) +++ gump/trunk/psp/index.html Thu Aug 26 20:47:32 2004 @@ -0,0 +1,11 @@ + + + This directory contains PSP (Python Server Pages). + + + + test + + + + \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37105 - gump/trunk/psp
Author: ajack
Date: Thu Aug 26 20:05:30 2004
New Revision: 37105
Added:
gump/trunk/psp/
gump/trunk/psp/test.psp
Log:
Tinkering w/ PSP.
Added: gump/trunk/psp/test.psp
==
--- (empty file)
+++ gump/trunk/psp/test.psp Thu Aug 26 20:05:30 2004
@@ -0,0 +1,6 @@
+
+ <%
+ import time
+ %>
+ Hello world, the time is: <%=time.strftime("%Y-%m-%d, %H:%M:%S")%>
+
\ No newline at end of file
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project packaged-jetty.xml
ajack 2004/08/26 09:54:58 Modified:project packaged-jetty.xml Log: Get the JAAS name right... Revision ChangesPath 1.6 +2 -2 gump/project/packaged-jetty.xml Index: packaged-jetty.xml === RCS file: /home/cvs/gump/project/packaged-jetty.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- packaged-jetty.xml26 Aug 2004 16:48:51 - 1.5 +++ packaged-jetty.xml26 Aug 2004 16:54:58 - 1.6 @@ -33,13 +33,13 @@ - + org.mortbay.jetty - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project packaged-jetty.xml
ajack 2004/08/26 09:48:51 Modified:project packaged-jetty.xml Log: Extra... Revision ChangesPath 1.5 +3 -3 gump/project/packaged-jetty.xml Index: packaged-jetty.xml === RCS file: /home/cvs/gump/project/packaged-jetty.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- packaged-jetty.xml26 Aug 2004 15:22:26 - 1.4 +++ packaged-jetty.xml26 Aug 2004 16:48:51 - 1.5 @@ -32,14 +32,14 @@ org.mortbay.jetty - - + + org.mortbay.jetty - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/08/26 09:42:12 Modified:profile gump.xml Log: Set each packaged-jetty as a package... Revision ChangesPath 1.390 +2 -0 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- gump.xml 26 Aug 2004 14:50:11 - 1.389 +++ gump.xml 26 Aug 2004 16:42:12 - 1.390 @@ -346,6 +346,8 @@ + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project packaged-jetty.xml
ajack 2004/08/26 07:50:11 Modified:profile gump.xml project packaged-jetty.xml Log: Use Jetty 5.0 RC2. Revision ChangesPath 1.389 +1 -1 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.388 retrieving revision 1.389 diff -u -r1.388 -r1.389 --- gump.xml 23 Aug 2004 02:40:52 - 1.388 +++ gump.xml 26 Aug 2004 14:50:11 - 1.389 @@ -345,7 +345,7 @@ - + 1.3 +10 -1 gump/project/packaged-jetty.xml Index: packaged-jetty.xml === RCS file: /home/cvs/gump/project/packaged-jetty.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- packaged-jetty.xml18 Mar 2004 12:08:21 - 1.2 +++ packaged-jetty.xml26 Aug 2004 14:50:11 - 1.3 @@ -22,9 +22,18 @@ -org.mortbay +org.mortbay.jetty + + + + +org.mortbay.jetty + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37045 - gump/trunk/python/gump/build
Author: ajack
Date: Wed Aug 25 14:15:22 2004
New Revision: 37045
Modified:
gump/trunk/python/gump/build/builder.py
Log:
Fixed typo.
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Wed Aug 25 14:15:22 2004
@@ -115,7 +115,7 @@
if project.okToPerformWork():
log.debug('Performing Build Upon: [' + `project.getPosition()` + '] '
+ project.getName())
-if project.isPrereq():
+if project.isPrereqFailed():
project.addWarning('Building despite certain prerequisite
failures [repository build].')
# Turn on --verbose or --debug if failing ...
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 37042 - in gump/trunk/python/gump: build document/xdocs rdf run runner syndication test
Author: ajack
Date: Wed Aug 25 13:34:48 2004
New Revision: 37042
Added:
gump/trunk/python/gump/rdf/ (props changed)
gump/trunk/python/gump/rdf/__init__.py
gump/trunk/python/gump/rdf/describer.py
gump/trunk/python/gump/test/describer.py
Modified:
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/run/options.py
gump/trunk/python/gump/runner/runner.py
gump/trunk/python/gump/syndication/atom.py
gump/trunk/python/gump/syndication/rss.py
gump/trunk/python/gump/test/pyunit.py
Log:
Some tinkering with RDF (hopefully allowing RDF to be optional)
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Wed Aug 25 13:34:48 2004
@@ -115,6 +115,9 @@
if project.okToPerformWork():
log.debug('Performing Build Upon: [' + `project.getPosition()` + '] '
+ project.getName())
+if project.isPrereq():
+project.addWarning('Building despite certain prerequisite
failures [repository build].')
+
# Turn on --verbose or --debug if failing ...
#if stats:
#if (not STATE_SUCCESS == stats.currentState) and \
Modified: gump/trunk/python/gump/document/xdocs/documenter.py
==
--- gump/trunk/python/gump/document/xdocs/documenter.py (original)
+++ gump/trunk/python/gump/document/xdocs/documenter.py Wed Aug 25 13:34:48 2004
@@ -293,6 +293,14 @@
atomArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + atomUrl) \
.createIcon(self.resolver.getImageUrl('valid-atom.png'), alt='[Valid
Atom]') #, title='Validate my Atom feed', width='88', height='31')
+rdfSyndRow=definitionTable.createRow()
+rdfSyndRow.createData().createStrong('Metadata')
+rdfArea=rdfSyndRow.createData()
+rdfArea.createFork('atom.rdf','RDF')
+rdfUrl=self.resolver.getUrl(self.workspace,'gump','.rdf')
+#rdfArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + rdfUrl) \
+#.createIcon(self.resolver.getImageUrl('valid-rdf.png'), alt='[Valid
Atom]') #, title='Validate my Atom feed', width='88', height='31')
+
self.documentSummary(document,self.workspace.getProjectSummary())
dtSection=definitionSection.createSection('Dates/Times')
Added: gump/trunk/python/gump/rdf/__init__.py
==
--- (empty file)
+++ gump/trunk/python/gump/rdf/__init__.py Wed Aug 25 13:34:48 2004
@@ -0,0 +1,21 @@
+#!/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$"
+__date__ = "$Date$"
+__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation"
+__license__ = "http://www.apache.org/licenses/LICENSE-2.0";
Added: gump/trunk/python/gump/rdf/describer.py
==
--- (empty file)
+++ gump/trunk/python/gump/rdf/describer.py Wed Aug 25 13:34:48 2004
@@ -0,0 +1,195 @@
+#!/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.
+
+"""
+
+ RDF Describing...
+
+"""
+
+import socket
+import stri
svn commit: rev 36833 - in gump/live: python/gump/build template/xhtml/images
Author: ajack
Date: Tue Aug 24 19:33:40 2004
New Revision: 36833
Added:
gump/live/template/xhtml/images/valid-atom.png (props changed)
- copied unchanged from rev 36832,
gump/trunk/template/xhtml/images/valid-atom.png
gump/live/template/xhtml/images/valid-rss.png (props changed)
- copied unchanged from rev 36832, gump/trunk/template/xhtml/images/valid-rss.png
Modified:
gump/live/python/gump/build/builder.py
Log:
I'd hoped this was stable, try again...
Modified: gump/live/python/gump/build/builder.py
==
--- gump/live/python/gump/build/builder.py (original)
+++ gump/live/python/gump/build/builder.py Tue Aug 24 19:33:40 2004
@@ -436,7 +436,7 @@
if artifacts.has_key(id):
(aid,date,extn,path)=artifacts[id]
-log.info('Utilize %s from Gump artifact repository for id' %
(path, id))
+log.info('Utilize %s from Gump artifact repository for id: %s' %
(path, id))
# Stash this fallback...
jar.setPath(path)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36832 - in gump/trunk: python/gump/build template/xhtml/images
Author: ajack
Date: Tue Aug 24 19:32:03 2004
New Revision: 36832
Added:
gump/trunk/template/xhtml/images/valid-atom.png (contents, props changed)
gump/trunk/template/xhtml/images/valid-rss.png (contents, props changed)
Modified:
gump/trunk/python/gump/build/builder.py
Log:
Don't crash when using artifacts from repository...
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Tue Aug 24 19:32:03 2004
@@ -436,7 +436,7 @@
if artifacts.has_key(id):
(aid,date,extn,path)=artifacts[id]
-log.info('Utilize %s from Gump artifact repository for id' %
(path, id))
+log.info('Utilize %s from Gump artifact repository for id: %s' %
(path, id))
# Stash this fallback...
jar.setPath(path)
Added: gump/trunk/template/xhtml/images/valid-atom.png
==
Binary file. No diff available.
Added: gump/trunk/template/xhtml/images/valid-rss.png
==
Binary file. No diff available.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36787 - in gump/trunk/python/gump: document/xdocs syndication
Author: ajack
Date: Mon Aug 23 14:34:29 2004
New Revision: 36787
Modified:
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/syndication/atom.py
gump/trunk/python/gump/syndication/rss.py
Log:
Support RSS|Atom validation.
Modified: gump/trunk/python/gump/document/xdocs/documenter.py
==
--- gump/trunk/python/gump/document/xdocs/documenter.py (original)
+++ gump/trunk/python/gump/document/xdocs/documenter.py Mon Aug 23 14:34:29 2004
@@ -279,10 +279,19 @@
rssSyndRow=definitionTable.createRow()
rssSyndRow.createData().createStrong('Syndication')
-rssSyndRow.createData().createFork('rss.xml','RSS')
+rssArea=rssSyndRow.createData()
+rssArea.createFork('rss.xml','RSS')
+rssUrl=self.resolver.getUrl(self.workspace,'rss','.xml')
+rssArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + rssUrl) \
+.createIcon(self.resolver.getImageUrl('valid-rss.png'), alt='[Valid
RSS]') #, title='Validate my RSS feed', width='88', height='31')
+
atomSyndRow=definitionTable.createRow()
atomSyndRow.createData().createStrong('Syndication')
-atomSyndRow.createData().createFork('atom.xml','Atom')
+atomArea=atomSyndRow.createData()
+atomArea.createFork('atom.xml','Atom')
+atomUrl=self.resolver.getUrl(self.workspace,'atom','.xml')
+atomArea.createFork('http://www.feedvalidator.org/check.cgi?url=' + atomUrl) \
+.createIcon(self.resolver.getImageUrl('valid-atom.png'), alt='[Valid
Atom]') #, title='Validate my Atom feed', width='88', height='31')
self.documentSummary(document,self.workspace.getProjectSummary())
Modified: gump/trunk/python/gump/syndication/atom.py
==
--- gump/trunk/python/gump/syndication/atom.py (original)
+++ gump/trunk/python/gump/syndication/atom.py Mon Aug 23 14:34:29 2004
@@ -136,7 +136,7 @@
self.feed=AtomFeed(feedUrl,feedFile, \
'workspace', \
'Apache Gump', \
-self.workspace.logurl, \
+self.workspace.getLogUrl(),\
"""Life is like a box of chocolates""")
def completeRun(self):
Modified: gump/trunk/python/gump/syndication/rss.py
==
--- gump/trunk/python/gump/syndication/rss.py (original)
+++ gump/trunk/python/gump/syndication/rss.py Mon Aug 23 14:34:29 2004
@@ -235,7 +235,7 @@
self.rss=RSS(self.rssUrl,self.rssFile, \
Channel('Apache Gump', \
-self.workspace.logurl, \
+self.workspace.getLogUrl(),\
"""Life is like a box of chocolates""", \
self.gumpImage))
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36783 - gump/trunk/python/gump/document/xdocs
Author: ajack Date: Mon Aug 23 13:39:08 2004 New Revision: 36783 Modified: gump/trunk/python/gump/document/xdocs/synchronizer.py Log: Define the wired event... Modified: gump/trunk/python/gump/document/xdocs/synchronizer.py == --- gump/trunk/python/gump/document/xdocs/synchronizer.py (original) +++ gump/trunk/python/gump/document/xdocs/synchronizer.py Mon Aug 23 13:39:08 2004 @@ -22,6 +22,7 @@ from gump import log from gump.utils.tools import syncDirectories,copyDirectories,wipeDirectoryTree +from gump.run.gumprun import * import gump.run.actor class Synchronizer(gump.run.actor.AbstractRunActor): - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36782 - gump/trunk/python/gump/document/xdocs
Author: ajack
Date: Mon Aug 23 13:29:59 2004
New Revision: 36782
Modified:
gump/trunk/python/gump/document/xdocs/synchronizer.py
Log:
Wire the event to the action...
Modified: gump/trunk/python/gump/document/xdocs/synchronizer.py
==
--- gump/trunk/python/gump/document/xdocs/synchronizer.py (original)
+++ gump/trunk/python/gump/document/xdocs/synchronizer.py Mon Aug 23 13:29:59
2004
@@ -29,7 +29,14 @@
def __init__(self, run, documenter):
gump.run.actor.AbstractRunActor.__init__(self, run)
self.documenter=documenter
-
+
+def processOtherEvent(self,event):
+
+workspace=self.run.getWorkspace()
+
+if isinstance(event,FinalizeRunEvent):
+self.synchronizeRun()
+
def synchronizeRun(self):
log.debug('--- Synchronize Results')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36778 - in gump/trunk/python: . gump/document/xdocs gump/runner
Author: ajack
Date: Mon Aug 23 13:04:32 2004
New Revision: 36778
Added:
gump/trunk/python/gump/document/xdocs/synchronizer.py
Modified:
gump/trunk/python/ (props changed)
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/runner/runner.py
Log:
Introduced Synchronizer to sync after *both* docs and syndication performed.
Modified: gump/trunk/python/gump/document/xdocs/documenter.py
==
--- gump/trunk/python/gump/document/xdocs/documenter.py (original)
+++ gump/trunk/python/gump/document/xdocs/documenter.py Mon Aug 23 13:04:32 2004
@@ -105,9 +105,6 @@
if self.run.getOptions().isOfficial():
self.documentStatistics()
self.documentXRef()
-
-# Synchronize xdocs...
-return self.syncXDocs()
#
#
@@ -252,35 +249,6 @@
return success
-def syncXDocs(self):
-
-# The move contents/xdocs from work directory to log
-xdocWorkDir=self.getXDocWorkDirectory()
-logDirectory=self.getXDocLogDirectory()
-
-log.info('Synchronize work->log, and clean-up...')
-
-success=True
-try:
-
-if self.run.getOptions().isOfficial():
-# Sync over public pages...
-syncDirectories(xdocWorkDir,logDirectory)
-else:
-# Copy over public pages...
-copyDirectories(xdocWorkDir,logDirectory)
-
-cleanUp=True
-if cleanUp:
-# Clean-up work area
-wipeDirectoryTree(xdocWorkDir)
-
-except:
-log.error('--- Failed to work->log sync and/or clean-up', exc_info=1)
-success=False
-
-return success
-
#
#
# Workspace Pieces
Added: gump/trunk/python/gump/document/xdocs/synchronizer.py
==
--- (empty file)
+++ gump/trunk/python/gump/document/xdocs/synchronizer.py Mon Aug 23 13:04:32
2004
@@ -0,0 +1,68 @@
+#!/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.
+
+
+"""
+XDOC generation.
+"""
+
+from gump import log
+
+from gump.utils.tools import syncDirectories,copyDirectories,wipeDirectoryTree
+import gump.run.actor
+
+class Synchronizer(gump.run.actor.AbstractRunActor):
+
+def __init__(self, run, documenter):
+gump.run.actor.AbstractRunActor.__init__(self, run)
+self.documenter=documenter
+
+def synchronizeRun(self):
+
+log.debug('--- Synchronize Results')
+
+# Synchronize xdocs...
+return self.syncXDocs()
+
+def syncXDocs(self):
+
+# The move contents/xdocs from work directory to log
+xdocWorkDir=self.documenter.getXDocWorkDirectory()
+logDirectory=self.documenter.getXDocLogDirectory()
+
+log.info('Synchronize work->log, and clean-up...')
+
+success=True
+try:
+
+if self.run.getOptions().isOfficial():
+# Sync over public pages...
+syncDirectories(xdocWorkDir,logDirectory)
+else:
+# Copy over public pages...
+copyDirectories(xdocWorkDir,logDirectory)
+
+cleanUp=True
+if cleanUp:
+# Clean-up work area
+wipeDirectoryTree(xdocWorkDir)
+
+except:
+log.error('--- Failed to work->log sync and/or clean-up', exc_info=1)
+success=False
+
+return success
+
\ No newline at end of file
Modified: gump/trunk/python/gump/runner/runner.py
==
--- gump/trunk/python/gump/runner/runner.py (original)
+++ gump/trunk/python/gump/runner/runner.py Mon Aug 23 13:04:32 2004
@@ -29,6 +29,7 @@
from gump.document.text.documenter import TextDoc
svn commit: rev 36765 - in gump/trunk/python: . gump/run test
Author: ajack Date: Mon Aug 23 10:44:46 2004 New Revision: 36765 Removed: gump/trunk/python/test/ Modified: gump/trunk/python/ (props changed) gump/trunk/python/gump/run/options.py Log: 1) And again... 2) Some SVN cleanups... Modified: gump/trunk/python/gump/run/options.py == --- gump/trunk/python/gump/run/options.py (original) +++ gump/trunk/python/gump/run/options.py Mon Aug 23 10:44:46 2004 @@ -65,10 +65,10 @@ FEATURE_PUBLISH=0x20 FEATURE_DOCUMENT=0x40 -FEATURE_DEFAULT=FEATURE_SYNDICATE&FEATURE_DOCUMENT&FEATURE_NOTIFY +FEATURE_DEFAULT=FEATURE_SYNDICATE|FEATURE_DOCUMENT|FEATURE_NOTIFY -FEATURE_ALL=FEATURE_STATISTICS&FEATURE_RESULTS&FEATURE_NOTIFY&FEATURE_DIAGRAM&\ -FEATURE_SYNDICATE&FEATURE_PUBLISH&FEATURE_DOCUMENT +FEATURE_ALL=FEATURE_STATISTICS|FEATURE_RESULTS|FEATURE_NOTIFY|FEATURE_DIAGRAM|\ +FEATURE_SYNDICATE|FEATURE_PUBLISH|FEATURE_DOCUMENT FEATURE_OFFICIAL=FEATURE_ALL - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36764 - in gump/trunk: . cron python/gump/run
Author: ajack Date: Mon Aug 23 10:22:12 2004 New Revision: 36764 Modified: gump/trunk/cron/gump.sh (props changed) gump/trunk/exe.py (contents, props changed) gump/trunk/python/gump/run/options.py Log: And again... Modified: gump/trunk/exe.py == --- gump/trunk/exe.py (original) +++ gump/trunk/exe.py Mon Aug 23 10:22:12 2004 @@ -32,4 +32,4 @@ # 1 - install py2exe [http://starship.python.net/crew/theller/py2exe/] # 2 - run: python exedist.py py2exe -setup(name="integrate",scripts=["integrate.py"],) +setup(name="gump",scripts=["gump.py"],) Modified: gump/trunk/python/gump/run/options.py == --- gump/trunk/python/gump/run/options.py (original) +++ gump/trunk/python/gump/run/options.py Mon Aug 23 10:22:12 2004 @@ -65,7 +65,7 @@ FEATURE_PUBLISH=0x20 FEATURE_DOCUMENT=0x40 -FEATURE_DEFAULT=FEATURE_DOCUMENT +FEATURE_DEFAULT=FEATURE_SYNDICATE&FEATURE_DOCUMENT&FEATURE_NOTIFY FEATURE_ALL=FEATURE_STATISTICS&FEATURE_RESULTS&FEATURE_NOTIFY&FEATURE_DIAGRAM&\ FEATURE_SYNDICATE&FEATURE_PUBLISH&FEATURE_DOCUMENT - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36763 - in gump/trunk: . bin python python/gump python/gump/admin python/gump/build python/gump/core python/gump/document/text python/gump/document/xdocs python/gump/java python/gump/process python/gump/run python/gump/runner python/gump/utils
Author: ajack Date: Mon Aug 23 10:02:35 2004 New Revision: 36763 Added: gump/trunk/exe.py (contents, props changed) - copied, changed from rev 36651, gump/trunk/bin/exe.py Removed: gump/trunk/bin/exe.py Modified: gump/trunk/ (props changed) gump/trunk/bin/build.py (contents, props changed) gump/trunk/bin/check.py (contents, props changed) gump/trunk/bin/env.py (contents, props changed) gump/trunk/bin/gmp.bat (props changed) gump/trunk/bin/gmp.py (props changed) gump/trunk/bin/gmp.sh (props changed) gump/trunk/bin/integrate.py (contents, props changed) gump/trunk/bin/preview.py (contents, props changed) gump/trunk/bin/redo.py (contents, props changed) gump/trunk/bin/repo.py (contents, props changed) gump/trunk/bin/update.py (contents, props changed) gump/trunk/python/gump/__init__.py gump/trunk/python/gump/admin/__init__.py gump/trunk/python/gump/admin/stats.py gump/trunk/python/gump/build/__init__.py gump/trunk/python/gump/build/ant.py gump/trunk/python/gump/build/builder.py gump/trunk/python/gump/build/maven.py gump/trunk/python/gump/build/script.py gump/trunk/python/gump/core/__init__.py gump/trunk/python/gump/core/commandLine.py gump/trunk/python/gump/core/gumpinit.py gump/trunk/python/gump/document/text/__init__.py gump/trunk/python/gump/document/text/documenter.py gump/trunk/python/gump/document/text/resolver.py gump/trunk/python/gump/document/xdocs/__init__.py gump/trunk/python/gump/java/cp.py gump/trunk/python/gump/process/launcher.py gump/trunk/python/gump/run/gumprun.py gump/trunk/python/gump/run/options.py gump/trunk/python/gump/runner/runner.py gump/trunk/python/gump/utils/sync.py gump/trunk/python/header.txt (contents, props changed) Log: Try to allow syndication again... Modified: gump/trunk/bin/build.py == --- gump/trunk/bin/build.py (original) +++ gump/trunk/bin/build.py Mon Aug 23 10:02:35 2004 @@ -14,6 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +__revision__ = "$Rev$" +__date__ = "$Date$" +__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation" +__license__ = "http://www.apache.org/licenses/LICENSE-2.0"; + + """ This is one commandline entrypoint into gump. Modified: gump/trunk/bin/check.py == --- gump/trunk/bin/check.py (original) +++ gump/trunk/bin/check.py Mon Aug 23 10:02:35 2004 @@ -14,6 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +__revision__ = "$Rev$" +__date__ = "$Date$" +__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation" +__license__ = "http://www.apache.org/licenses/LICENSE-2.0"; + + """ Checks that the Gump definitions are ok. Modified: gump/trunk/bin/env.py == --- gump/trunk/bin/env.py (original) +++ gump/trunk/bin/env.py Mon Aug 23 10:02:35 2004 @@ -14,6 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +__revision__ = "$Rev$" +__date__ = "$Date$" +__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation" +__license__ = "http://www.apache.org/licenses/LICENSE-2.0"; + + """ Checks that the Gump Environment is ok. """ Modified: gump/trunk/bin/integrate.py == --- gump/trunk/bin/integrate.py (original) +++ gump/trunk/bin/integrate.py Mon Aug 23 10:02:35 2004 @@ -14,6 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +__revision__ = "$Rev$" +__date__ = "$Date$" +__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation" +__license__ = "http://www.apache.org/licenses/LICENSE-2.0"; + + # # $Header: /home/stefano/cvs/gump/python/gump/integrate.py,v 1.31 2004/07/19 16:07:53 ajack Exp $ # Modified: gump/trunk/bin/preview.py == --- gump/trunk/bin/preview.py (original) +++ gump/trunk/bin/preview.py Mon Aug 23 10:02:35 2004 @@ -14,6 +14,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +__revision__ = "$Rev$" +__date__ = "$Date$" +__copyright__ = "Copyright (
svn commit: rev 36713 - gump/trunk/python/gump/syndication
Author: ajack
Date: Sun Aug 22 16:58:29 2004
New Revision: 36713
Modified:
gump/trunk/python/gump/syndication/atom.py
gump/trunk/python/gump/syndication/rss.py
Log:
Increase verbosity to debug absense.
Modified: gump/trunk/python/gump/syndication/atom.py
==
--- gump/trunk/python/gump/syndication/atom.py (original)
+++ gump/trunk/python/gump/syndication/atom.py Sun Aug 22 16:58:29 2004
@@ -111,7 +111,7 @@
""")
def serialize(self):
-log.debug("Atom News Feed to : " + self.file);
+log.info("Atom News Feed to : " + self.file);
stream = open(self.file,'w')
modified=time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
Modified: gump/trunk/python/gump/syndication/rss.py
==
--- gump/trunk/python/gump/syndication/rss.py (original)
+++ gump/trunk/python/gump/syndication/rss.py Sun Aug 22 16:58:29 2004
@@ -193,10 +193,10 @@
def endRSS(self):
# complete the rss feed
self.rssStream.write('\n')
-log.debug("RSS Newsfeed written to : " + self.rssFile);
+log.info("RSS Newsfeed written to : " + self.rssFile);
def serialize(self):
-log.debug("RSS Newsfeed to : " + self.rssFile);
+log.info("RSS Newsfeed to : " + self.rssFile);
self.rssStream = open(self.rssFile,'w')
self.startRSS()
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project jetty.xml
ajack 2004/08/20 13:35:34 Modified:project jetty.xml Log: Work in progress... Revision ChangesPath 1.17 +3 -0 gump/project/jetty.xml Index: jetty.xml === RCS file: /home/cvs/gump/project/jetty.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jetty.xml 18 Aug 2004 13:49:05 - 1.16 +++ jetty.xml 20 Aug 2004 20:35:34 - 1.17 @@ -48,7 +48,10 @@ + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36667 - gump/trunk
Author: ajack Date: Fri Aug 20 07:55:45 2004 New Revision: 36667 Modified: gump/trunk/gump.py (contents, props changed) Log: More tinkering w/ properties... Modified: gump/trunk/gump.py == --- gump/trunk/gump.py (original) +++ gump/trunk/gump.py Fri Aug 20 07:55:45 2004 @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -__revision__ = "$Revision$" +__revision__ = "$Rev$" __date__ = "$Date$" __copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation" __license__ = "http://www.apache.org/licenses/LICENSE-2.0"; @@ -23,9 +23,10 @@ """ This is the commandline entrypoint into Python Gump, - used *primarily* by nightly cron jobs. + for full integrations. See cron/gump.py for the same + but used *primarily* by nightly cron jobs. - It updates Gump (from CVS) to ensure it (itself) is + It updates Gump (from soruce control) to ensure it (itself) is latest, does some environment twiddling, and runs the main gump/integration.py. Bit more twiddling with outputs afterwards... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36666 - gump/trunk
Author: ajack Date: Fri Aug 20 07:49:19 2004 New Revision: 3 Modified: gump/trunk/gump.py Log: Explore svn:keywords Modified: gump/trunk/gump.py == --- gump/trunk/gump.py (original) +++ gump/trunk/gump.py Fri Aug 20 07:49:19 2004 @@ -15,7 +15,10 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# $Header: $ +__revision__ = "$Revision$" +__date__ = "$Date$" +__copyright__ = "Copyright (c) 1999-2004 Apache Software Foundation" +__license__ = "http://www.apache.org/licenses/LICENSE-2.0"; """ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36637 - in gump/trunk: bin python/gump/build python/gump/repository python/gump/runner python/gump/utils
Author: ajack
Date: Thu Aug 19 14:25:37 2004
New Revision: 36637
Added:
gump/trunk/bin/repo.py
Modified:
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/repository/artifact.py
gump/trunk/python/gump/runner/demand.py
gump/trunk/python/gump/utils/sync.py
Log:
A repository examination/cleaning tool...
Added: gump/trunk/bin/repo.py
==
--- (empty file)
+++ gump/trunk/bin/repo.py Thu Aug 19 14:25:37 2004
@@ -0,0 +1,55 @@
+#!/usr/bin/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.
+
+"""
+Works on the Gump Repository
+"""
+
+import os.path
+import sys
+import pprint
+
+from gump import log
+from gump.core.gumpinit import gumpinit
+
+import gump.repository.artifact
+
+# static void main()
+if __name__=='__main__':
+gumpinit()
+
+result = 1
+
+if not len(sys.argv) >= 1:
+raise RuntimeError, 'Usage: repo.py \'repo directory\' [\'clean\']'
+
+dir = sys.argv[1]
+clean = len(sys.argv) == 2
+
+if not os.path.exists(dir): raise RuntimeError, 'No such directory : ' + `dir`
+if not os.path.isdir(dir): raise RuntimeError, 'Not a directory : ' + `dir`
+
+repo=gump.repository.artifact.ArtifactRepository(dir)
+
+for group in repo.getGroups():
+print '-'
+print 'Group : ' + group
+pprint.pprint(repo.extractGroup(group))
+
+log.info('Gump Repository Tool Complete. Exit code:' + str(result))
+
+# bye!
+sys.exit(result)
\ No newline at end of file
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Thu Aug 19 14:25:37 2004
@@ -406,14 +406,15 @@
log.info(' -- Attempt Repository Search for : '+ project.getName())
+group=project.getArtifactGroup()
+
# See if we have any...
-artifacts = self.repository.extractMostRecentGroup(project.getArtifactGroup())
+artifacts = self.repository.extractMostRecentGroup(group)
if not artifacts:
self.checkUpstreamRepositories(project)
# Then try again...
-artifacts =
self.repository.extractMostRecentGroup(project.getArtifactGroup())
+artifacts = self.repository.extractMostRecentGroup(group)
-
# :TODO:
# If not artifacts, download using Depot?
@@ -434,8 +435,8 @@
# Stash this fallback...
jar.setPath(path)
else:
-log.info('Failed to find artifact for id %s (Gump Repo has %s)' %
\
-(id, artifacts.keys()))
+log.info('Failed to find artifact for id %s (Gump Repo has %s in
%s)' % \
+(id, artifacts.keys(), group))
artifactsOk=False
break
Modified: gump/trunk/python/gump/repository/artifact.py
==
--- gump/trunk/python/gump/repository/artifact.py (original)
+++ gump/trunk/python/gump/repository/artifact.py Thu Aug 19 14:25:37 2004
@@ -80,7 +80,7 @@
"""
Get all groups in the repository
"""
-return os.path.listdir(getRepositoryDir())
+return os.listdir(self.getRepositoryDir())
def cleanRepository(self):
for group in self.getGroups():
@@ -172,5 +172,4 @@
"""
(dates,mostRecent)=self.extractGroup(group)
if dates: return dates[mostRecent]
-
-
\ No newline at end of file
+
\ No newline at end of file
Modified: gump/trunk/python/gump/runner/demand.py
==
--- gump/trunk/python/gump/runner/demand.py (original)
+++ gump/trunk/python/gump/runner/demand.py Thu Aug 19 14:25:3
svn commit: rev 36635 - in gump/trunk/python/gump: build document/xdocs integration process run update
Author: ajack
Date: Thu Aug 19 14:01:14 2004
New Revision: 36635
Modified:
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/document/xdocs/xdoc.py
gump/trunk/python/gump/integration/cvs.py
gump/trunk/python/gump/integration/depot.py
gump/trunk/python/gump/process/launcher.py
gump/trunk/python/gump/run/gumprun.py
gump/trunk/python/gump/update/artifact.py
gump/trunk/python/gump/update/cvs.py
Log:
Some debug tweaks, and one fix for repo scanning.
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Thu Aug 19 14:01:14 2004
@@ -435,7 +435,7 @@
jar.setPath(path)
else:
log.info('Failed to find artifact for id %s (Gump Repo has %s)' %
\
-(id, artifact.keys()))
+(id, artifacts.keys()))
artifactsOk=False
break
Modified: gump/trunk/python/gump/document/xdocs/xdoc.py
==
--- gump/trunk/python/gump/document/xdocs/xdoc.py (original)
+++ gump/trunk/python/gump/document/xdocs/xdoc.py Thu Aug 19 14:01:14 2004
@@ -722,7 +722,7 @@
def __init__(self,title,output=None,config=None,rootpath='.'):
if isinstance(output,types.StringTypes):
self.xfile=output
-log.debug('Documenting to file : [' + self.xfile + ']')
+#log.debug('Documenting to file : [' + self.xfile + ']')
# Open for writing with a decent sized buffer.
self.output=open(self.xfile, 'w', 4096)
else:
Modified: gump/trunk/python/gump/integration/cvs.py
==
--- gump/trunk/python/gump/integration/cvs.py (original)
+++ gump/trunk/python/gump/integration/cvs.py Thu Aug 19 14:01:14 2004
@@ -91,8 +91,9 @@
logins[root]=newpass
else:
-log.debug('Login already available for: ' + repository.getName() \
-+ ' @ ' + root)
+pass
+#log.debug('Login already available for: ' + repository.getName() \
+#+ ' @ ' + root)
else:
log.warn('Unable to provide login for CVS repository: ' +
repository.getName() \
+ ' @ ' + root + ' method: ' + str(repository.getMethod()) )
Modified: gump/trunk/python/gump/integration/depot.py
==
--- gump/trunk/python/gump/integration/depot.py (original)
+++ gump/trunk/python/gump/integration/depot.py Thu Aug 19 14:01:14 2004
@@ -57,8 +57,7 @@
cmd.addParameter('-rs','gump')
# Target
-cmd.addParameter('-t')
-cmd.addParameter(repository)
+cmd.addParameter('-t',repository)
return cmd
Modified: gump/trunk/python/gump/process/launcher.py
==
--- gump/trunk/python/gump/process/launcher.py (original)
+++ gump/trunk/python/gump/process/launcher.py Thu Aug 19 14:01:14 2004
@@ -93,9 +93,9 @@
' >>' + str(outputFile) + ' 2>&1'
log.debug('Executing: ' + execString)
-log.debug(' Exec: ' + str(execFile))
-log.debug(' Output: ' + str(outputFile))
-log.debug('Full Exec: ' + fullExec)
+#log.debug(' Exec: ' + str(execFile))
+#log.debug(' Output: ' + str(outputFile))
+#log.debug('Full Exec: ' + fullExec)
# Execute Command & Wait
systemReturn=os.system(fullExec)
Modified: gump/trunk/python/gump/run/gumprun.py
==
--- gump/trunk/python/gump/run/gumprun.py (original)
+++ gump/trunk/python/gump/run/gumprun.py Thu Aug 19 14:01:14 2004
@@ -170,7 +170,7 @@
"""
log.debug('Dispatch Event : ' + `event`)
for actor in self.actors:
-log.debug('Dispatch Event : ' + `event` + ' to ' + `actor`)
+#log.debug('Dispatch Event : ' + `event` + ' to ' + `actor`)
actor._processEvent(event)
gump.utils.inspectGarbageCollection(`event`
svn commit: rev 36578 - in gump/trunk/python/gump: build document/xdocs integration java model repository test update utils
Author: ajack
Date: Wed Aug 18 13:20:58 2004
New Revision: 36578
Modified:
gump/trunk/python/gump/build/builder.py
gump/trunk/python/gump/document/xdocs/documenter.py
gump/trunk/python/gump/integration/depot.py
gump/trunk/python/gump/java/helper.py
gump/trunk/python/gump/model/depend.py
gump/trunk/python/gump/model/module.py
gump/trunk/python/gump/model/project.py
gump/trunk/python/gump/model/propagation.py
gump/trunk/python/gump/model/state.py
gump/trunk/python/gump/repository/artifact.py
gump/trunk/python/gump/repository/publisher.py
gump/trunk/python/gump/test/artifacts.py
gump/trunk/python/gump/update/artifact.py
gump/trunk/python/gump/utils/work.py
Log:
First changes for 'building from repository' (and Depot download).
Modified: gump/trunk/python/gump/build/builder.py
==
--- gump/trunk/python/gump/build/builder.py (original)
+++ gump/trunk/python/gump/build/builder.py Wed Aug 18 13:20:58 2004
@@ -58,6 +58,8 @@
from gump.model.stats import *
from gump.model.state import *
+import gump.integration.depot
+
import gump.java.helper
@@ -100,58 +102,52 @@
# :TODO: Code this nicer, perhaps...
if project.isPackaged():
self.performProjectPackageProcessing(project, languageHelper, stats)
-return
-
-# Do this even if not ok
-self.performPreBuild(project, languageHelper, stats)
+else:
+# Do this even if not ok
+self.performPreBuild(project, languageHelper, stats)
-if project.okToPerformWork():
-log.debug('Performing Build Upon: [' + `project.getPosition()` + '] ' +
project.getName())
+if project.okToPerformWork():
+log.debug('Performing Build Upon: [' + `project.getPosition()` + '] '
+ project.getName())
-# Turn on --verbose or --debug if failing ...
-if stats:
-if (not STATE_SUCCESS == stats.currentState) and \
-not project.isVerboseOrDebug():
-if stats.sequenceInState > SIGNIFICANT_DURATION:
-project.addInfo('Enable "debug" output, due to a sequence of
%s previous errors.' % stats.sequenceInState)
-project.setDebug(True)
-else:
-project.addInfo('Enable "verbose" output, due to %s previous
error(s).' % stats.sequenceInState)
-project.setVerbose(True)
-
-# Pick your poison..
-if project.hasScript():
-self.script.buildProject(project, languageHelper, stats)
-elif project.hasAnt():
-self.ant.buildProject(project, languageHelper, stats)
-elif project.hasMaven():
-self.maven.buildProject(project, languageHelper, stats)
-
-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, languageHelper, stats )
+# Turn on --verbose or --debug if failing ...
+#if stats:
+#if (not STATE_SUCCESS == stats.currentState) and \
+#not project.isVerboseOrDebug():
+#if stats.sequenceInState > SIGNIFICANT_DURATION:
+#project.addInfo('Enable "debug" output, due to a
sequence of %s previous errors.' % stats.sequenceInState)
+#project.setDebug(True)
+#else:
+#project.addInfo('Enable "verbose" output, due to %s
previous error(s).' % stats.sequenceInState)
+#project.setVerbose(True)
+
+# Pick your poison..
+if project.hasScript():
+self.script.buildProject(project, languageHelper, stats)
+elif project.hasAnt():
+self.ant.buildProject(project, languageHelper, stats)
+elif project.hasMaven():
+self.maven.buildProject(project, languageHelper, stats)
+
+# Do this even if not ok
+self.performPostBuild( project, languageHelper, stats )
+
+# If not ok, we might have some artifacts in the repository that
+# are of value...
+if not project.okToPerformWork() and project.hasOutputs():
+self.extractFromRepository(project, languageHelper)
svn commit: rev 36570 - in gump/live: . python/gump/core python/gump/document/xdocs python/gump/integration
Author: ajack
Date: Wed Aug 18 08:19:02 2004
New Revision: 36570
Modified:
gump/live/ARTIFACT_DISCLAIMER.html
gump/live/python/gump/core/config.py
gump/live/python/gump/document/xdocs/documenter.py
gump/live/python/gump/integration/depot.py
Log:
Merge TRUNK into LIVE to generate a stable version.
Modified: gump/live/ARTIFACT_DISCLAIMER.html
==
--- gump/live/ARTIFACT_DISCLAIMER.html (original)
+++ gump/live/ARTIFACT_DISCLAIMER.html Wed Aug 18 08:19:02 2004
@@ -2,4 +2,7 @@
The artifacts in this directory are explicitly NOT supported by the Apache
Sopftware Foundation. These artifacts are not trusted, since they are built by an
untrusted build process. Do NOT use these artifacts for any purposes other than
Gumping.
-For more information contact the http://gump.apache.org";>Gump Team at
mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]
\ No newline at end of file
+This repository contains arbitrary code downloaded from third party sites and may
include dangerous root kits, use at your own risk.
+
+
+ For more information contact the http://gump.apache.org";>Gump
Team at mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]
\ No newline at end of file
Modified: gump/live/python/gump/core/config.py
==
--- gump/live/python/gump/core/config.py(original)
+++ gump/live/python/gump/core/config.pyWed Aug 18 08:19:02 2004
@@ -54,7 +54,7 @@
class setting:
"""Configuration of hardcoded settings"""
-VERSION='2.1.0-alpha-0002'
+VERSION='2.1.0-alpha-0003'
WS_VERSION="0.4"
WS_MINIMUM_VERSION="0.3"
Modified: gump/live/python/gump/document/xdocs/documenter.py
==
--- gump/live/python/gump/document/xdocs/documenter.py (original)
+++ gump/live/python/gump/document/xdocs/documenter.py Wed Aug 18 08:19:02 2004
@@ -1757,12 +1757,13 @@
detailsList.createEntry('Redistributable: ', `project.isRedistributable()`)
# Display nag information
-if project.hasNotifys() and project.isVerboseOrDebug():
-for pair in project.getNotifys():
-toaddr=pair.getToAddress()
-fromaddr=pair.getFromAddress()
-detailsList.createEntry('Notify To:
').createFork('mailto:'+toaddr,toaddr)
-detailsList.createEntry('Notify From:
').createFork('mailto:'+fromaddr,fromaddr)
+if project.hasNotifys():
+if project.isVerboseOrDebug():
+for pair in project.getNotifys():
+toaddr=pair.getToAddress()
+fromaddr=pair.getFromAddress()
+detailsList.createEntry('Notify To:
').createFork('mailto:'+toaddr,toaddr)
+detailsList.createEntry('Notify From:
').createFork('mailto:'+fromaddr,fromaddr)
elif not project.isPackaged() and project.hasBuilder():
document.createWarning('This project does not utilize Gump
notification.')
@@ -1960,7 +1961,7 @@
if stats.startOfState:
statsTable.createEntry("Start of state: ", stats.startOfState.isoformat())
if stats.previousState:
-statsTable.createEntry("Previous State: ",
stats.previousState.isoformat())
+statsTable.createEntry("Previous State: ", stats.previousState)
if stats.first:
statsTable.createEntry("First Success: ", stats.first.isoformat())
Modified: gump/live/python/gump/integration/depot.py
==
--- gump/live/python/gump/integration/depot.py (original)
+++ gump/live/python/gump/integration/depot.py Wed Aug 18 08:19:02 2004
@@ -32,12 +32,10 @@
return '${DEPOT_HOME|DEPOT_UPDATE_HOME}'
def getDepotUpdatePath():
-return os.path.join(
-os.path.join(getDepotHome(),'bin'),
-'update.py')
+return os.path.join(getDepotHome(),'depot.py')
def getDepotUpdateCmd():
-return sys.executable+' '+getDepotUpdatePath()
+return sys.executable+' '+getDepotUpdatePath()+' update'
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36569 - gump/trunk
Author: ajack Date: Wed Aug 18 07:49:32 2004 New Revision: 36569 Added: gump/trunk/README Log: A test commit... Added: gump/trunk/README == --- (empty file) +++ gump/trunk/README Wed Aug 18 07:49:32 2004 @@ -0,0 +1 @@ +This is Apache Gump - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project jetty.xml
ajack 2004/08/18 06:49:05 Modified:project jetty.xml Log: Start work on jetty-plus. Revision ChangesPath 1.16 +14 -1 gump/project/jetty.xml Index: jetty.xml === RCS file: /home/cvs/gump/project/jetty.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jetty.xml 1 Jun 2004 11:03:18 - 1.15 +++ jetty.xml 18 Aug 2004 13:49:05 - 1.16 @@ -26,7 +26,7 @@ module="Jetty"/> -org.mortbay +org.mortbay.jetty @@ -38,6 +38,19 @@ + + + + +org.mortbay.jetty.plus + + + + + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/08/17 20:52:49 Modified:profile gump.xml Log: Complete tagsoup addition... Revision ChangesPath 1.380 +3 -0 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- gump.xml 18 Aug 2004 03:11:03 - 1.379 +++ gump.xml 18 Aug 2004 03:52:49 - 1.380 @@ -277,6 +277,9 @@ + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/08/17 20:11:03 Modified:project xom.xml profile gump.xml Added: project tagsoup.xml Log: Adding tagsoup, a new dependency for XOM. Revision ChangesPath 1.8 +5 -8 gump/project/xom.xml Index: xom.xml === RCS file: /home/cvs/gump/project/xom.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xom.xml 27 Feb 2004 09:22:57 - 1.7 +++ xom.xml 18 Aug 2004 03:11:03 - 1.8 @@ -31,17 +31,14 @@ + - - - - + + 1.1 gump/project/tagsoup.xml Index: tagsoup.xml === A SAX-compliant parser written in Java that, instead of parsing well-formed or valid XML, parses HTML as it is found in the wild: nasty and brutish, though quite often far from short. http://mercury.ccil.org/~cowan/XML/tagsoup/"/> org.ccil.cowan.tagsoup 1.379 +1 -0 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- gump.xml 12 Aug 2004 21:56:25 - 1.378 +++ gump.xml 18 Aug 2004 03:11:03 - 1.379 @@ -342,6 +342,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36484 - gump/trunk/python/gump/document/xdocs
Author: ajack
Date: Mon Aug 16 17:29:51 2004
New Revision: 36484
Modified:
gump/trunk/python/gump/document/xdocs/documenter.py
Log:
Applied Bill Barker's patch.
Modified: gump/trunk/python/gump/document/xdocs/documenter.py
==
--- gump/trunk/python/gump/document/xdocs/documenter.py (original)
+++ gump/trunk/python/gump/document/xdocs/documenter.py Mon Aug 16 17:29:51 2004
@@ -1757,12 +1757,13 @@
detailsList.createEntry('Redistributable: ', `project.isRedistributable()`)
# Display nag information
-if project.hasNotifys() and project.isVerboseOrDebug():
-for pair in project.getNotifys():
-toaddr=pair.getToAddress()
-fromaddr=pair.getFromAddress()
-detailsList.createEntry('Notify To:
').createFork('mailto:'+toaddr,toaddr)
-detailsList.createEntry('Notify From:
').createFork('mailto:'+fromaddr,fromaddr)
+if project.hasNotifys():
+if project.isVerboseOrDebug():
+for pair in project.getNotifys():
+toaddr=pair.getToAddress()
+fromaddr=pair.getFromAddress()
+detailsList.createEntry('Notify To:
').createFork('mailto:'+toaddr,toaddr)
+detailsList.createEntry('Notify From:
').createFork('mailto:'+fromaddr,fromaddr)
elif not project.isPackaged() and project.hasBuilder():
document.createWarning('This project does not utilize Gump
notification.')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project jakarta-commons.xml
ajack 2004/08/14 09:45:59 Modified:project jakarta-commons.xml Log: Build failures indicate that commons-config now uses commons-beanutils, let's hope this one (core) is enough. Revision ChangesPath 1.140 +1 -0 gump/project/jakarta-commons.xml Index: jakarta-commons.xml === RCS file: /home/cvs/gump/project/jakarta-commons.xml,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- jakarta-commons.xml 12 Jul 2004 19:23:32 - 1.139 +++ jakarta-commons.xml 14 Aug 2004 16:45:59 - 1.140 @@ -653,6 +653,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36367 - in gump/trunk: . python/gump/core python/gump/integration
Author: ajack
Date: Fri Aug 13 12:57:34 2004
New Revision: 36367
Modified:
gump/trunk/ARTIFACT_DISCLAIMER.html
gump/trunk/python/gump/core/config.py
gump/trunk/python/gump/integration/depot.py
Log:
Tweaks to match depot changes.
Modified: gump/trunk/ARTIFACT_DISCLAIMER.html
==
--- gump/trunk/ARTIFACT_DISCLAIMER.html (original)
+++ gump/trunk/ARTIFACT_DISCLAIMER.html Fri Aug 13 12:57:34 2004
@@ -2,7 +2,7 @@
The artifacts in this directory are explicitly NOT supported by the Apache
Sopftware Foundation. These artifacts are not trusted, since they are built by an
untrusted build process. Do NOT use these artifacts for any purposes other than
Gumping.
-This repository contains arbitrary code downloaded from third party sites and may
include dangerous root kits, use at your own risk.
+This repository contains arbitrary code downloaded from third party sites and may
include dangerous root kits, use at your own risk.
For more information contact the http://gump.apache.org";>Gump
Team at mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]
Modified: gump/trunk/python/gump/core/config.py
==
--- gump/trunk/python/gump/core/config.py (original)
+++ gump/trunk/python/gump/core/config.py Fri Aug 13 12:57:34 2004
@@ -54,7 +54,7 @@
class setting:
"""Configuration of hardcoded settings"""
-VERSION='2.1.0-alpha-0002'
+VERSION='2.1.0-alpha-0003'
WS_VERSION="0.4"
WS_MINIMUM_VERSION="0.3"
Modified: gump/trunk/python/gump/integration/depot.py
==
--- gump/trunk/python/gump/integration/depot.py (original)
+++ gump/trunk/python/gump/integration/depot.py Fri Aug 13 12:57:34 2004
@@ -32,12 +32,10 @@
return '${DEPOT_HOME|DEPOT_UPDATE_HOME}'
def getDepotUpdatePath():
-return os.path.join(
-os.path.join(getDepotHome(),'bin'),
-'update.py')
+return os.path.join(getDepotHome(),'depot.py')
def getDepotUpdateCmd():
-return sys.executable+' '+getDepotUpdatePath()
+return sys.executable+' '+getDepotUpdatePath()+' update'
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36363 - gump/trunk
Author: ajack Date: Fri Aug 13 12:29:13 2004 New Revision: 36363 Modified: gump/trunk/ARTIFACT_DISCLAIMER.html Log: Extended the disclaimer... per Noel's suggestion. Modified: gump/trunk/ARTIFACT_DISCLAIMER.html == --- gump/trunk/ARTIFACT_DISCLAIMER.html (original) +++ gump/trunk/ARTIFACT_DISCLAIMER.html Fri Aug 13 12:29:13 2004 @@ -2,4 +2,7 @@ The artifacts in this directory are explicitly NOT supported by the Apache Sopftware Foundation. These artifacts are not trusted, since they are built by an untrusted build process. Do NOT use these artifacts for any purposes other than Gumping. -For more information contact the http://gump.apache.org";>Gump Team at mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] \ No newline at end of file +This repository contains arbitrary code downloaded from third party sites and may include dangerous root kits, use at your own risk. + + + For more information contact the http://gump.apache.org";>Gump Team at mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED] \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36318 - gump/trunk/python/gump/document/xdocs
Author: ajack
Date: Thu Aug 12 20:00:30 2004
New Revision: 36318
Modified:
gump/trunk/python/gump/document/xdocs/documenter.py
Log:
Previous State is not a date...
Modified: gump/trunk/python/gump/document/xdocs/documenter.py
==
--- gump/trunk/python/gump/document/xdocs/documenter.py (original)
+++ gump/trunk/python/gump/document/xdocs/documenter.py Thu Aug 12 20:00:30 2004
@@ -1960,7 +1960,7 @@
if stats.startOfState:
statsTable.createEntry("Start of state: ", stats.startOfState.isoformat())
if stats.previousState:
-statsTable.createEntry("Previous State: ",
stats.previousState.isoformat())
+statsTable.createEntry("Previous State: ", stats.previousState)
if stats.first:
statsTable.createEntry("First Success: ", stats.first.isoformat())
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36314 - gump/live
Author: ajack Date: Thu Aug 12 19:25:45 2004 New Revision: 36314 Added: gump/live/ - copied from rev 36310, gump/trunk/ Log: Attempting a 'live' directory (think of it as branch, think of it as tag, but it will be continually updated). Reading SVN documentation, I am cool with doing this outside of the /branch and /tag directories we've set up. This is for live, public usage, so we can test more and break (public) less. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/08/12 14:56:26 Modified:profile gump.xml Log: Same as with bouncy castle. Match the project name, not the module name. Revision ChangesPath 1.378 +1 -1 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.377 retrieving revision 1.378 diff -u -r1.377 -r1.378 --- gump.xml 11 Aug 2004 20:02:32 - 1.377 +++ gump.xml 12 Aug 2004 21:56:25 - 1.378 @@ -287,7 +287,7 @@ - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36304 - in gump/trunk: metadata python/gump/repository python/gump/shared
Author: ajack Date: Thu Aug 12 14:48:03 2004 New Revision: 36304 Modified: gump/trunk/metadata/ (props changed) gump/trunk/python/gump/repository/artifact.py gump/trunk/python/gump/shared/comparator.py Log: More datetime fixes... Modified: gump/trunk/python/gump/repository/artifact.py == --- gump/trunk/python/gump/repository/artifact.py (original) +++ gump/trunk/python/gump/repository/artifact.py Thu Aug 12 14:48:03 2004 @@ -84,7 +84,7 @@ # if id: (artifactRoot, artifactExtn) = os.path.splitext(artifactName) -artifactName=id + '-gump-' + default.date.strftime(setting.DATE_FORMAT) + artifactExtn +artifactName=id + '-gump-' + default.date_s + artifactExtn newArtifact=os.path.join(cdir,artifactName) Modified: gump/trunk/python/gump/shared/comparator.py == --- gump/trunk/python/gump/shared/comparator.py (original) +++ gump/trunk/python/gump/shared/comparator.py Thu Aug 12 14:48:03 2004 @@ -17,7 +17,27 @@ # # $Header: /home/stefano/cvs/gump/python/gump/shared/comparator.py,v 1.5 2004/07/08 20:33:11 ajack Exp $ # - + +def compareObjects(o1,o2): +""" +Compare two objects, but be ware of Nones... +""" + +if o1: +if o2: +if o1 > o2: +return 1 +elif o1 == o2: +return 0 +else: +return -1 +else: +return 1 # 02 none +else: +if o2: return -1 # o1 none + +return 0 # Both none + # # Module Comparisons # @@ -61,13 +81,9 @@ return c def compareModulesByLastModified(module1,module2): -lu1=module1.getLastModified() -lu2=module2.getLastModified() -if not lu1: lu1 = -1 -if not lu2: lu2 = -1 -c= int(round(lu2 - lu1,0)) -if not c: c=cmp(module1,module2) -return c +lm1=module1.getLastModified() +lm2=module2.getLastModified() +return compareObjects(lm1,lm2) # # Project Comparisons @@ -105,13 +121,9 @@ return c def compareProjectsByLastModified(project1,project2): -lu1=project1.getLastModified() -lu2=project2.getLastModified() -if not lu1: lu1 = -1 -if not lu2: lu2 = -1 -c= int(round(lu2 - lu1,0)) -if not c: c=cmp(project1,project2) -return c +lm1=project1.getLastModified() +lm2=project2.getLastModified() +return compareObjects(lm1,lm2) def compareProjectsBySequenceInState(project1,project2): seq1=project1.getStats().sequenceInState - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36255 - gump/trunk/python/gump/stats/mysql
Author: ajack
Date: Wed Aug 11 13:55:46 2004
New Revision: 36255
Modified:
gump/trunk/python/gump/stats/mysql/statsdb.py
Log:
Quote last modified date (in SQL)
Modified: gump/trunk/python/gump/stats/mysql/statsdb.py
==
--- gump/trunk/python/gump/stats/mysql/statsdb.py (original)
+++ gump/trunk/python/gump/stats/mysql/statsdb.py Wed Aug 11 13:55:46 2004
@@ -146,7 +146,7 @@
def putModuleStats(self,stats):
extras=None
if stats.lastModified:
-extras={'last_modified':stats.lastModified}
+extras={'last_modified':"'" + stats.lastModified.strftime('%Y-%m-%d
%H:%M:%S') + "'"}
self._putStats('module_stats','module_name',stats,extras)
def delModuleStats(self,stats):
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36253 - in gump/trunk/python/gump: model stats/mysql
Author: ajack
Date: Wed Aug 11 13:37:00 2004
New Revision: 36253
Modified:
gump/trunk/python/gump/model/module.py
gump/trunk/python/gump/stats/mysql/statsdb.py
Log:
More haste (less speed)
Modified: gump/trunk/python/gump/model/module.py
==
--- gump/trunk/python/gump/model/module.py (original)
+++ gump/trunk/python/gump/model/module.py Wed Aug 11 13:37:00 2004
@@ -682,4 +682,4 @@
# Track code updates/changes
#
if module.isModified():
-self.lastModified=default.default.datetimeObject
\ No newline at end of file
+self.lastModified=default.datetimeObject
\ No newline at end of file
Modified: gump/trunk/python/gump/stats/mysql/statsdb.py
==
--- gump/trunk/python/gump/stats/mysql/statsdb.py (original)
+++ gump/trunk/python/gump/stats/mysql/statsdb.py Wed Aug 11 13:37:00 2004
@@ -131,7 +131,14 @@
# Extract that extra
if settings.has_key('last_modified') and settings['last_modified']:
-stats.lastModified=settings['last_modified']
+value=settings['last_modified']
+if isinstance(value,datetime.datetime):
+stats.lastModified=value
+else:
+if not value == '-00-00 00:00:00':
+setattr(stats,attr,
+
datetime.datetime.fromtimestamp(time.mktime(time.strptime(value,
+
'%Y-%m-%d %H:%M:%S'
except IndexError:
pass
return stats
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36251 - gump/trunk/python/gump/model
Author: ajack Date: Wed Aug 11 13:31:52 2004 New Revision: 36251 Modified: gump/trunk/python/gump/model/module.py Log: Moving to MySQL means a transition from timestamps (secs as float) to datetime objects. More work to do. Modified: gump/trunk/python/gump/model/module.py == --- gump/trunk/python/gump/model/module.py (original) +++ gump/trunk/python/gump/model/module.py Wed Aug 11 13:31:52 2004 @@ -682,4 +682,4 @@ # Track code updates/changes # if module.isModified(): -self.lastModified=default.time \ No newline at end of file +self.lastModified=default.default.datetimeObject \ No newline at end of file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36250 - gump/trunk/python/gump/stats/mysql
Author: ajack Date: Wed Aug 11 13:23:47 2004 New Revision: 36250 Modified: gump/trunk/python/gump/stats/mysql/statsdb.py Log: Ignore: -00-00 00:00:00 Modified: gump/trunk/python/gump/stats/mysql/statsdb.py == --- gump/trunk/python/gump/stats/mysql/statsdb.py (original) +++ gump/trunk/python/gump/stats/mysql/statsdb.py Wed Aug 11 13:23:47 2004 @@ -190,8 +190,10 @@ if isinstance(value,datetime.datetime): setattr(stats,attr,value) else: -setattr(stats,attr, - datetime.datetime.fromtimestamp(time.mktime(time.strptime(value,'%Y-%m-%d %H:%M:%S' +if not value == '-00-00 00:00:00': +setattr(stats,attr, + datetime.datetime.fromtimestamp(time.mktime(time.strptime(value, + '%Y-%m-%d %H:%M:%S' else: setattr(stats,attr,value) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36249 - gump/trunk/python/gump/stats/mysql
Author: ajack Date: Wed Aug 11 13:21:35 2004 New Revision: 36249 Modified: gump/trunk/python/gump/stats/mysql/statsdb.py Log: retry Modified: gump/trunk/python/gump/stats/mysql/statsdb.py == --- gump/trunk/python/gump/stats/mysql/statsdb.py (original) +++ gump/trunk/python/gump/stats/mysql/statsdb.py Wed Aug 11 13:21:35 2004 @@ -191,7 +191,7 @@ setattr(stats,attr,value) else: setattr(stats,attr, - datetime.datetime.fromtimestamp(time.strptime(value,'%Y-%m-%d %H:%M:%S'))) + datetime.datetime.fromtimestamp(time.mktime(time.strptime(value,'%Y-%m-%d %H:%M:%S' else: setattr(stats,attr,value) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36248 - gump/trunk/python/gump/stats/mysql
Author: ajack Date: Wed Aug 11 13:19:25 2004 New Revision: 36248 Modified: gump/trunk/python/gump/stats/mysql/statsdb.py Log: Attempt to cope w/ some MySQL interfaces returning strings, not datetime.datetime, i.e. pre-Python 2.3 I guess. Modified: gump/trunk/python/gump/stats/mysql/statsdb.py == --- gump/trunk/python/gump/stats/mysql/statsdb.py (original) +++ gump/trunk/python/gump/stats/mysql/statsdb.py Wed Aug 11 13:19:25 2004 @@ -179,8 +179,21 @@ for (attr, column) in StatisticsDB.ATTR_COLUMN_MAP.items(): if settings.has_key(column) and settings[column]: if hasattr(stats,attr): -#print "GET ATTR : " + `type(getattr(stats,attr))` -setattr(stats,attr,settings[column]) +value=settings[column] + +# Seems some SQL interfaces do not return datetime objects +# but strings, for SQL:datetime. + + +if column in StatisticsDB.DATES: +print "GET ATTR : " + `type(getattr(stats,attr))` +if isinstance(value,datetime.datetime): +setattr(stats,attr,value) +else: +setattr(stats,attr, + datetime.datetime.fromtimestamp(time.strptime(value,'%Y-%m-%d %H:%M:%S'))) +else: +setattr(stats,attr,value) def _putBaseStats(self,stats,column_name): """ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/08/11 13:02:32 Modified:profile gump.xml Log: I have to match the project names here (for Gupmy). Not sure if traditional worked diffrently... Revision ChangesPath 1.377 +2 -1 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.376 retrieving revision 1.377 diff -u -r1.376 -r1.377 --- gump.xml 11 Aug 2004 10:20:10 - 1.376 +++ gump.xml 11 Aug 2004 20:02:32 - 1.377 @@ -285,7 +285,8 @@ - + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36241 - gump/trunk/python/gump/mysql
Author: ajack
Date: Wed Aug 11 11:56:27 2004
New Revision: 36241
Modified:
gump/trunk/python/gump/mysql/databaser.py
Log:
Complete last (on all SQL, I hope.)
Modified: gump/trunk/python/gump/mysql/databaser.py
==
--- gump/trunk/python/gump/mysql/databaser.py (original)
+++ gump/trunk/python/gump/mysql/databaser.py Wed Aug 11 11:56:27 2004
@@ -81,7 +81,7 @@
helper=None
try:
conn=self.getConnected()
-helper=gump.utils.mysql.DbHelper(conn)
+helper=gump.utils.mysql.DbHelper(conn,self.dbInfo.getDatabase())
# Prepare the data
settings = {}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36238 - in gump/trunk/python/gump: mysql stats/mysql utils
Author: ajack
Date: Wed Aug 11 11:16:45 2004
New Revision: 36238
Modified:
gump/trunk/python/gump/mysql/databaser.py
gump/trunk/python/gump/stats/mysql/statsdb.py
gump/trunk/python/gump/utils/mysql.py
Log:
Allow the database to be configurable (within the SQL).
Modified: gump/trunk/python/gump/mysql/databaser.py
==
--- gump/trunk/python/gump/mysql/databaser.py (original)
+++ gump/trunk/python/gump/mysql/databaser.py Wed Aug 11 11:16:45 2004
@@ -33,6 +33,7 @@
def __init__(self,run):
gump.run.actor.AbstractRunActor.__init__(self,run)
+self.dbInfo=self.workspace.getDatabaseInformation()
def processOtherEvent(self,event):
pass
@@ -51,7 +52,7 @@
helper=None
try:
conn=self.getConnected()
-helper=gump.utils.mysql.DbHelper(conn)
+helper=gump.utils.mysql.DbHelper(conn,self.dbInfo.getDatabase())
# Prepare the data
settings = {}
@@ -106,13 +107,12 @@
"""
Get a database connection.
"""
-dbInfo=self.workspace.getDatabaseInformation()
return MySQLdb.Connect(
-host=dbInfo.getHost(),
-user=dbInfo.getUser(),
-passwd=dbInfo.getPasswd(),
-db=dbInfo.getDatabase(),
+host=self.dbInfo.getHost(),
+user=self.dbInfo.getUser(),
+passwd=self.dbInfo.getPasswd(),
+db=self.dbInfo.getDatabase(),
compress=1,
cursorclass=MySQLdb.cursors.DictCursor)
Modified: gump/trunk/python/gump/stats/mysql/statsdb.py
==
--- gump/trunk/python/gump/stats/mysql/statsdb.py (original)
+++ gump/trunk/python/gump/stats/mysql/statsdb.py Wed Aug 11 11:16:45 2004
@@ -76,7 +76,7 @@
# print 'ThreadSafe : ' + `MySQLdb.threadsafety`
-self.helper=gump.utils.mysql.DbHelper(self.conn)
+self.helper=gump.utils.mysql.DbHelper(self.conn,dbInfo.getDatabase())
# Workspace
def getWorkspaceStats(self,workspaceName):
Modified: gump/trunk/python/gump/utils/mysql.py
==
--- gump/trunk/python/gump/utils/mysql.py (original)
+++ gump/trunk/python/gump/utils/mysql.py Wed Aug 11 11:16:45 2004
@@ -29,8 +29,9 @@
MySQL Statistics Database Interface
"""
-def __init__(self,conn):
+def __init__(self,conn,database='gump'):
self.conn=conn
+self.database=database
def __del__(self):
if self.conn:
@@ -41,7 +42,7 @@
"""
Generate a select statement, index is a single name
"""
-statement="SELECT * FROM gump.gump_%s WHERE %s='%s'" % (table_name,
column_name, entity_name)
+statement="SELECT * FROM %s.gump_%s WHERE %s='%s'" % (self.database,
table_name, column_name, entity_name)
return statement
def select(self,table_name,column_name,entity_name,columns):
@@ -85,7 +86,7 @@
"""
Perform an SQL INSERT
"""
-statement = "INSERT INTO gump.gump_%s (" % table_name
+statement = "INSERT INTO %s.gump_%s (" % (self.database, table_name)
keys=settings.keys()
statement += ", ".join(keys)
statement += ") VALUES ("
@@ -120,7 +121,7 @@
Take a dictionary of settings (column names/types) and
generate an update statement. Note: The index is a single name.
"""
-statement = "UPDATE gump.gump_%s SET " % table_name
+statement = "UPDATE %s.gump_%s SET " % (self.database, table_name)
keys=settings.keys()
keys.remove(column_name)
statement += ", ".join([key + '=' + str(settings[key]) for key in keys])
@@ -154,8 +155,8 @@
Perform an SQL DELETE
Index is single name
"""
-statement = "DELETE FROM gump.gump_%s WHERE %s='%s'" \
-% (table_name, column_name, entity_name)
+statement = "DELETE FROM %s.gump_%s WHERE %s='%s'" \
+% (self.database, table_name, column_name, entity_name)
return statement
def delete(self,table_name,column_name,entity_name):
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project xml-xerces2.xml
ajack 2004/08/09 15:53:27 Modified:project xml-xerces2.xml Log: See if crimson is optional in JDK1.4 and above, since it is history in JDK 1.5... Revision ChangesPath 1.32 +0 -1 gump/project/xml-xerces2.xml Index: xml-xerces2.xml === RCS file: /home/cvs/gump/project/xml-xerces2.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- xml-xerces2.xml 25 Mar 2004 04:44:58 - 1.31 +++ xml-xerces2.xml 9 Aug 2004 22:53:26 - 1.32 @@ -29,7 +29,6 @@ org.apache.xerces - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project rhino.xml
ajack 2004/08/09 14:31:47 Modified:project rhino.xml Log: Per Igor Bukanov... Revision ChangesPath 1.18 +0 -1 gump/project/rhino.xml Index: rhino.xml === RCS file: /home/cvs/gump/project/rhino.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- rhino.xml 9 Aug 2004 20:31:51 - 1.17 +++ rhino.xml 9 Aug 2004 21:31:47 - 1.18 @@ -34,7 +34,6 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project rhino.xml
ajack 2004/08/09 13:31:51 Modified:project rhino.xml Log: Upon request from Rhino... Revision ChangesPath 1.17 +1 -0 gump/project/rhino.xml Index: rhino.xml === RCS file: /home/cvs/gump/project/rhino.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- rhino.xml 23 May 2004 16:23:29 - 1.16 +++ rhino.xml 9 Aug 2004 20:31:51 - 1.17 @@ -35,6 +35,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 36070 - gump/trunk/python/gump/core
Author: ajack
Date: Sat Aug 7 11:35:53 2004
New Revision: 36070
Modified:
gump/trunk/python/gump/core/config.py
Log:
(Still) attempting to fix the directories (After the re-org broke them)
Modified: gump/trunk/python/gump/core/config.py
==
--- gump/trunk/python/gump/core/config.py (original)
+++ gump/trunk/python/gump/core/config.py Sat Aug 7 11:35:53 2004
@@ -36,16 +36,14 @@
"""Configuration of paths"""
cmdpath = os.path.abspath(sys.argv[0])
-base = os.path.abspath(os.path.dirname(cmdpath))
+base = os.path.abspath(os.path.join(os.path.dirname(cmdpath),'..'))
-gump = os.path.abspath(os.path.dirname(cmdpath))
-
-cache = os.path.abspath('%s/%s' % (base,'cache'))
-work = os.path.abspath('%s/%s' % (base,'work'))
-tmp = os.path.abspath('%s/%s' % (base,'tmp'))
-template = os.path.abspath('%s/%s' % (base,'template'))
+cache = os.path.abspath(os.path.join(base,'cache'))
+work = os.path.abspath(os.path.join(base,'work'))
+tmp = os.path.abspath(os.path.join(base,'tmp'))
+template = os.path.abspath(os.path.join(base,'template'))
-test = os.path.abspath('%s/%s' % (base,'test'))
+test = os.path.abspath(os.path.join(base,'test'))
def gumpPath(path,basedir=None):
"""returns the path absolutized relative to the base gump dir"""
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project dom4j.xml
ajack 2004/08/03 13:21:51 Modified:project dom4j.xml Log: Per Marteen Coene's request to [EMAIL PROTECTED] Revision ChangesPath 1.45 +0 -1 gump/project/dom4j.xml Index: dom4j.xml === RCS file: /home/cvs/gump/project/dom4j.xml,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- dom4j.xml 3 Aug 2004 07:34:26 - 1.44 +++ dom4j.xml 3 Aug 2004 20:21:51 - 1.45 @@ -42,7 +42,6 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35643 - in gump/trunk: bin cron src/documentation/content/xdocs
Author: ajack
Date: Tue Aug 3 12:47:46 2004
New Revision: 35643
Modified:
gump/trunk/bin/gmp.py
gump/trunk/cron/gump.py
gump/trunk/src/documentation/content/xdocs/gettingstarted.xml
gump/trunk/src/documentation/content/xdocs/index.xml
gump/trunk/src/documentation/content/xdocs/site.xml
gump/trunk/src/documentation/content/xdocs/tabs.xml
Log:
Updated docs per SVN|CVS move.
Modified: gump/trunk/bin/gmp.py
==
--- gump/trunk/bin/gmp.py (original)
+++ gump/trunk/bin/gmp.py Tue Aug 3 12:47:46 2004
@@ -86,9 +86,9 @@
#
# Actually run the Gump command
#
-command=os.path.join(os.environ['GUMP_HOME'],'python/gump/'+command+'.py')
+command=os.path.join(os.environ['GUMP_HOME'],'bin/'+command+'.py')
-exitValue = runCommand('python '+command+' -w '+ws+' '+projects, iargs, 'python')
+exitValue = runCommand('python '+command+' -w '+ws+' '+projects, iargs)
return exitValue
Modified: gump/trunk/cron/gump.py
==
Binary files. No diff available.
Modified: gump/trunk/src/documentation/content/xdocs/gettingstarted.xml
==
--- gump/trunk/src/documentation/content/xdocs/gettingstarted.xml (original)
+++ gump/trunk/src/documentation/content/xdocs/gettingstarted.xml Tue Aug 3
12:47:46 2004
@@ -102,20 +102,33 @@
Jar Downloading
This is optional.
- Ruper -- http://incubator.apache.org/depot";>Depot
Updater
+ Depot -- http://incubator.apache.org/depot";>Depot
Updater
-Getting the source to Gump
+Getting the source/metadata for Gump
+ Getting the source
+ Gump source code resides in Subversion http://cvs.apache.org/viewcvs.cgi/gump/?root=Apache-SVN";>here.
+ svn checkout https://svn.apache.org/repos/asf/gump/trunk/ gump
+
+ This checks out the source code into a sub-directory called
gump.
+ Export $GUMP_HOME to (fully qualified) point to that directory.
+
+ Getting the metadata
+
+ The shared Gump metadata resides in CVS http://cvs.apache.org/viewcvs.cgi/gump/";>here.
+
+ cd gump
export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
cvs login
cvs co -d metadata gump
-
- If prompted for the password, enter anoncvs
+
+ If prompted for the password, enter anoncvs.
+ This checks out the metadata into a sub-directory called metadata, under
gump.
Defining your workspace
Modified: gump/trunk/src/documentation/content/xdocs/index.xml
==
--- gump/trunk/src/documentation/content/xdocs/index.xml(original)
+++ gump/trunk/src/documentation/content/xdocs/index.xmlTue Aug 3 12:47:46
2004
@@ -70,12 +70,6 @@
are then built on these outputs.
-
-Traditional Gump is undergoing a
re-write into http://nagoya.apache.org/wiki/apachewiki.cgi?GumpPython";>Python, see
-Python Gump. Be aware that some of this
documentation might be in transition,
-or state traditional information (when Python information difers.) Please
report any such findings to us.
-
-
The commands use the actual build.xml files from the projects, but do
not use the scripts or jar files checked into CVS/SVN. Instead, the
Modified: gump/trunk/src/documentation/content/xdocs/site.xml
==
--- gump/trunk/src/documentation/content/xdocs/site.xml (original)
+++ gump/trunk/src/documentation/content/xdocs/site.xml Tue Aug 3 12:47:46 2004
@@ -22,7 +22,8 @@
- http://cvs.apache.org/viewcvs/gump/"; label="Source"/>
+ http://cvs.apache.org/viewcvs/gump/?root=Apache-SVN";
label="Source"/>
+ http://cvs.apache.org/viewcvs/gump/"; label="Metadata"/>
http://wiki.apache.org/gump/FrequentlyAskedQuestions";
label="FAQ"/>
Modified: gump/trunk/src/documentation/content/xdocs/tabs.xml
==
--- gump/trunk/src/documentation/content/xdocs/tabs.xml (original)
+++ gump/trunk/src/documentation/content/xdocs/tabs.xml Tue Aug 3 12:47:46 2004
@@ -23,7 +23,6 @@
-
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35602 - in gump/trunk: . bin cron python python/gump python/gump/admin python/gump/build python/gump/core python/gump/document python/gump/document/text python/gump/document/xdocs python/gump/gui python/gump/gui/images python/gump/guru python/gump/integration python/gump/java python/gump/loader python/gump/model python/gump/notify python/gump/performance python/gump/process python/gump/repository python/gump/results python/gump/run python/gump/runner python/gump/shared python/gump/stats python/gump/storage python/gump/svg python/gump/syndication python/gump/test python/gump/test/resources/complete1 python/gump/test/resources/full1 python/gump/threads python/gump/timing python/gump/update python/gump/utils python/storage/random python/tool template/forrest
Author: ajack
Date: Mon Aug 2 14:51:57 2004
New Revision: 35602
Added:
gump/trunk/bin/gmp.bat
- copied unchanged from rev 35579, gump/trunk/bin/gump.bat
gump/trunk/bin/gmp.sh (props changed)
- copied unchanged from rev 35579, gump/trunk/bin/gump.sh
Removed:
gump/trunk/.cvsignore
gump/trunk/bin/gump.bat
gump/trunk/bin/gump.sh
gump/trunk/python/.cvsignore
gump/trunk/python/gump/.cvsignore
gump/trunk/python/gump/admin/.cvsignore
gump/trunk/python/gump/build/.cvsignore
gump/trunk/python/gump/core/.cvsignore
gump/trunk/python/gump/document/.cvsignore
gump/trunk/python/gump/document/text/.cvsignore
gump/trunk/python/gump/document/xdocs/.cvsignore
gump/trunk/python/gump/gui/.cvsignore
gump/trunk/python/gump/gui/images/.cvsignore
gump/trunk/python/gump/guru/.cvsignore
gump/trunk/python/gump/integration/.cvsignore
gump/trunk/python/gump/java/.cvsignore
gump/trunk/python/gump/loader/.cvsignore
gump/trunk/python/gump/model/.cvsignore
gump/trunk/python/gump/notify/.cvsignore
gump/trunk/python/gump/performance/.cvsignore
gump/trunk/python/gump/process/.cvsignore
gump/trunk/python/gump/repository/.cvsignore
gump/trunk/python/gump/results/.cvsignore
gump/trunk/python/gump/run/.cvsignore
gump/trunk/python/gump/runner/.cvsignore
gump/trunk/python/gump/shared/.cvsignore
gump/trunk/python/gump/stats/.cvsignore
gump/trunk/python/gump/storage/.cvsignore
gump/trunk/python/gump/svg/.cvsignore
gump/trunk/python/gump/syndication/.cvsignore
gump/trunk/python/gump/test/.cvsignore
gump/trunk/python/gump/test/resources/complete1/.cvsignore
gump/trunk/python/gump/test/resources/full1/.cvsignore
gump/trunk/python/gump/threads/.cvsignore
gump/trunk/python/gump/timing/.cvsignore
gump/trunk/python/gump/update/.cvsignore
gump/trunk/python/gump/utils/.cvsignore
gump/trunk/python/storage/random/.cvsignore
gump/trunk/python/tool/.cvsignore
gump/trunk/template/forrest/.cvsignore
Modified:
gump/trunk/ (props changed)
gump/trunk/bin/ (props changed)
gump/trunk/bin/gmp.py
gump/trunk/cron/gump.bat
gump/trunk/cron/gump.py
gump/trunk/python/ (props changed)
gump/trunk/python/gump/ (props changed)
gump/trunk/python/gump/admin/ (props changed)
gump/trunk/python/gump/core/config.py
gump/trunk/python/gump/process/launcher.py
gump/trunk/python/gump/run/gumpenv.py
gump/trunk/python/gump/test/resources/full1/ (props changed)
gump/trunk/python/tool/commitCheck.py
Log:
More migrating to SVN.
Modified: gump/trunk/bin/gmp.py
==
--- gump/trunk/bin/gmp.py (original)
+++ gump/trunk/bin/gmp.py Mon Aug 2 14:51:57 2004
@@ -94,7 +94,7 @@
if not os.environ.has_key('GUMP_HOME'):
-print 'Please set GUMP_HOME to where Gump is installed.'
+print 'Please set GUMP_HOME to where Gump (SVN code) is installed.'
sys.exit(1)
# Allow a lock
Modified: gump/trunk/cron/gump.bat
==
Binary files. No diff available.
Modified: gump/trunk/cron/gump.py
==
Binary files. No diff available.
Modified: gump/trunk/python/gump/core/config.py
==
--- gump/trunk/python/gump/core/config.py (original)
+++ gump/trunk/python/gump/core/config.py Mon Aug 2 14:51:57 2004
@@ -36,7 +36,7 @@
"""Configuration of paths"""
cmdpath = os.path.abspath(sys.argv[0])
-base = os.path.abspath('%s/%s' % (os.path.dirname(cmdpath),'../..'))
+base = os.path.abspath('%s/%s' % (os.path.dirname(cmdpath),'..'))
gump = os.path.abspath(os.path.dirname(cmdpath))
Modified: gump/trunk/python/gump/process/launcher.py
==
--- gump/trunk/python/gump/process/launcher.py (original)
+++ gump/trunk/python/gump/process/launcher.py Mon Aug 2 14:51:57 2004
@@ -32,7 +32,7 @@
import gump.process.command
-LAUNCHER=os.path.join(os.path.join(os.path.join(os.path.join('..','python'),'gump'),'process'),'launcher.py')
+LAUNCHER=os.path.join(os.path.join(os.path.join('python','gump'),'process'),'launcher.py')
def execute(cmd,tmp=dir.tmp):
res=gump.process.command.CmdResult(cmd)
Modified: gump/trunk/python/gump/run/gumpenv.py
==
--- gump/trunk/python/gump/run/gumpenv.py (original)
+++ gump/trunk/python/gump/run/gumpenv.py Mon Aug 2 14:51:57 2004
@@ -79,6 +79,9 @@
cvs commit: gump/blog/News TLP.txt
ajack 2004/08/02 13:00:08 Removed: blog/BoardReports 20040317.txt blojsom.properties blog/SuccessStories Log4J-CL-EL-JV.txt velocity-jdom.txt blojsom.properties xdoclet.txt jrefactory.txt xml-batik.txt blog/Issues Struts-Velocity.txt TakingControlOfModule.txt GumpStorm.txt Cactus-CommonsHttpclient.txt blog TestPost.txt read.me Template.txt blog/News TLP.txt Log: Removed peas-n-carrots (blog), since now in SVN also. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/template/xhtml/css style.css
ajack 2004/08/02 07:06:56 Modified:..cvsignore Removed: stylesheet move.xsl sedmap.xsl nobuild-projects.xsl win2k.xsl build.xsl deliver-local.xsl nag.xsl publish.xsl update.xsl winxp.xsl ant-build.xsl xref.xsl pubreport.xsl jakarta.xsl pubdocs.xsl bash.xsl python/gump/test/resources/complete1 module1.xml broken2.xml artifact_repository1.xml server2.xml profile.xml download1.xml maven1.xml module2.xml svn_repository1.xml package1.xml broken1.xml svn_module1.xml tracker1.xml module4.xml .cvsignore server1.xml repository1.xml alias1.xml module5.xml server3.xml module3.xml workspace.xml python/gump .cvsignore env.py update.py preview.py build.py __init__.py integrate.py check.py redo.py python/gump/svg __init__.py .cvsignore depdiag.py scale.py drawing.py svg.py src/documentation skinconf.xml python/gump/repository .cvsignore artifact.py __init__.py publisher.py python/gump/syndication __init__.py abstract.py rss.py .cvsignore atom.py syndicator.py python/gump/test/resources/full1 workspace.xml server1.xml server2.xml module2.xml svn_module1.xml package1.xml broken1.xml tracker1.xml broken2.xml server3.xml artifact_repository1.xml maven1.xml module3.xml module4.xml alias1.xml module5.xml .cvsignore download1.xml profile.xml svn_repository1.xml module1.xml repository1.xml python/gump/storage gen.py orphans.py .cvsignore template/forrest status.xml .cvsignore build.xml forrest.properties skinconf.xml forrest-targets.ent template/xhtml/images icon.png gump-logo.png PythonPowered.gif apache.png python/gump/model tracker.py repository.py workspace.py property.py builder.py propagation.py object.py state.py profile.py server.py stats.py depend.py .cvsignore misc.py module.py project.py __init__.py src/documentation/content/xdocs gettingstarted.xml faq.xml bylaws.xml index.xml tabs.xml why.xml mail.xml nagged.xml whoweare.xml status.xml site.xml python/gump/run __init__.py actor.py gumpenv.py .cvsignore options.py gumprun.py gumpset.py python/gump/core config.py __init__.py commandLine.py .cvsignore gumpinit.py python/gump/gui/images module.bmp back.bmp project_ex.bmp .cvsignore module_ex.bmp error.bmp exports.bmp run.bmp help.bmp warning.bmp gen.bmp property.bmp project.bmp workspace.bmp update.bmp prereqs.bmp gump.bmp info.bmp fatal.bmp referenced.bmp console.bmp dependencies.bmp debug.bmp classpath.bmp python/gump/test resolving.py svg.py tools.py stats.py artifacts.py __init__.py resulting.py loading.py threads.py xref.py updater.py integrator.py timing.py launching.py model.py diagram.py maven.py documenter.py drawing.py pyunit.py notifying.py .cvsignore xdocs.py unicode.py syndicator.py utils.py language.py sync.py python/gump/document __init__.py .cvsignore resolver.py documenter.py python/gump/process __init__.py launcher.py .cvsignore command.py python/gump/build maven.py ant.py script.py __init__.py builder.py .cvsignore python/tool commitCheck.py .cvsignore __init__.py profileResults.py python/gump/test/resources/circular1 workspace.xml repository.xml project2.xml project1.xml profile.xml java Module.java Workspace.java Repository.java Server.java Launcher.java LocalCheck.java Project.java Jenny.java python/gump/threads .cvsignore __init__.py tools.py python/gump/results __init__.py .cvsignore loader.py resulter.py model.py python .cvsignore header.txt gmp.py exe.py src/documentation/content/xdocs/metadata
svn commit: rev 35581 - gump/trunk/python/gump/process
Author: ajack
Date: Sun Aug 1 22:42:11 2004
New Revision: 35581
Modified:
gump/trunk/python/gump/process/launcher.py
Log:
Path to launcher has changed...
Modified: gump/trunk/python/gump/process/launcher.py
==
--- gump/trunk/python/gump/process/launcher.py (original)
+++ gump/trunk/python/gump/process/launcher.py Sun Aug 1 22:42:11 2004
@@ -32,7 +32,7 @@
import gump.process.command
-LAUNCHER=os.path.join(os.path.join('gump','process'),'launcher.py')
+LAUNCHER=os.path.join(os.path.join(os.path.join(os.path.join('..','python'),'gump'),'process'),'launcher.py')
def execute(cmd,tmp=dir.tmp):
res=gump.process.command.CmdResult(cmd)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35580 - in gump/trunk: bin src/documentation/content/xdocs
Author: ajack
Date: Sun Aug 1 22:35:32 2004
New Revision: 35580
Added:
gump/trunk/bin/gmp.py
Removed:
gump/trunk/bin/gump.py
Modified:
gump/trunk/src/documentation/content/xdocs/gettingstarted.xml
Log:
Only one thing can be called gump, not a module and an entry point.
Added: gump/trunk/bin/gmp.py
==
--- (empty file)
+++ gump/trunk/bin/gmp.py Sun Aug 1 22:35:32 2004
@@ -0,0 +1,213 @@
+#!/bin/bash
+#
+# 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.
+#
+# $Header: /home/stefano/cvs/gump/python/gmp.py,v 1.8 2004/04/26 01:00:33 ajack Exp $
+
+"""
+ This is the commandline entrypoint into Python Gump as a
+ build system (as opposed to a cronned CI tool).
+
+ It works similarly to "cvs", as it needs to be given the action
+ to do, and it needs to be run in the correct directory
+ (workspace or project).
+"""
+
+import os.path
+import os
+import sys
+import socket
+import time
+import signal
+import smtplib
+import StringIO
+from xml.dom import minidom
+
+def runCommand(command,args='',dir=None,outputFile=None):
+""" Run a command, and check the result... """
+
+#
+originalCWD=None
+if dir:
+originalCWD=os.getcwd()
+cwdpath=os.path.abspath(dir)
+try:
+if not os.path.exists(cwdpath): os.makedirs(dir)
+os.chdir(cwdpath)
+except Exception, details :
+# Log the problem and re-raise
+return 0
+
+try:
+
+fullCommand = command + ' ' + args
+
+#
+# Execute Command & Calculate Exit Code
+#
+systemReturn=os.system(fullCommand)
+
+if not os.name == 'dos' and not os.name == 'nt':
+waitcode=systemReturn
+
+#
+# The return code (from system = from wait) is (on Unix):
+#
+#a 16 bit number
+#top byte=exit status
+#low byte=signal that killed it
+#
+exit_code=(((waitcode & 0xFF00) >> 8) & 0xFF)
+
+else:
+exit_code=systemReturn
+
+finally:
+if originalCWD: os.chdir(originalCWD)
+
+return exit_code
+
+def callGmpCommand(ws,command,projects,iargs):
+
+iargs+=' --text'
+
+#
+# Actually run the Gump command
+#
+command=os.path.join(os.environ['GUMP_HOME'],'python/gump/'+command+'.py')
+
+exitValue = runCommand('python '+command+' -w '+ws+' '+projects, iargs, 'python')
+
+return exitValue
+
+
+if not os.environ.has_key('GUMP_HOME'):
+print 'Please set GUMP_HOME to where Gump is installed.'
+sys.exit(1)
+
+# Allow a lock
+lockFile=os.path.abspath('gmp.lock')
+if os.path.exists(lockFile):
+# :TODO: Ought we look at the contents, get the PID of the
+# supposed other Gump, and determine if it is still alive
+# or not?
+print """The lock file [%s] exists.
+Either Gump is still running, or it terminated very abnormally.
+Please resolve this (waiting or removing the lock file) before retrying.
+""" % lockFile
+sys.exit(1)
+
+# Write this PID into a lock file
+lock=open(lockFile,'w')
+lock.write(`os.getpid()`)
+lock.close()
+
+result=0
+
+args=sys.argv
+try:
+# print 'Apache Gump (A multi-project builder)'
+
+try:
+# Process Environment
+hostname = socket.gethostname()
+
+# The path of this command
+gmpPath = os.path.abspath(args[0])
+del args[0]
+
+# Workspace is the `hostname`.xml or workspace.xml,
+# unless overridden
+workspaceName = hostname + '.xml'
+if not os.path.exists(os.path.abspath(workspaceName)):
+workspaceName='workspace.xml'
+
+if os.environ.has_key('GUMP_WORKSPACE'):
+workspaceName = os.environ['GUMP_WORKSPACE'] + '.xml'
+if len(args)>2 and args[
svn commit: rev 35579 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 22:31:43 2004 New Revision: 35579 Modified: gump/trunk/cron/gump.py Log: Chase the CWD... Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35578 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 22:29:38 2004 New Revision: 35578 Modified: gump/trunk/cron/gump.py Log: Entry points are in bin. Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35573 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 21:04:29 2004 New Revision: 35573 Modified: gump/trunk/cron/gump.py Log: All the entry points moved to ./bin Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35572 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 21:03:00 2004 New Revision: 35572 Modified: gump/trunk/cron/gump.py Log: Hopefully the last move before something works, maybe. Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35571 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 21:01:26 2004 New Revision: 35571 Modified: gump/trunk/cron/gump.py Log: Opps mixing up Perl and Python... Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35570 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 21:00:47 2004 New Revision: 35570 Modified: gump/trunk/cron/gump.py Log: Workspaces are to be in ./metadata/ Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35569 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 20:59:52 2004 New Revision: 35569 Modified: gump/trunk/cron/gump.py Log: Once we moved into .., no need to add .. Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: rev 35568 - gump/trunk/cron
Author: ajack Date: Sun Aug 1 20:51:04 2004 New Revision: 35568 Modified: gump/trunk/cron/gump.py Log: Typo Modified: gump/trunk/cron/gump.py == Binary files. No diff available. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project incubator-geronimo.xml
ajack 2004/07/29 11:11:10 Modified:project incubator-geronimo.xml Log: Attempt a target of 'jar' (not default) for now. Revision ChangesPath 1.5 +1 -2 gump/project/incubator-geronimo.xml Index: incubator-geronimo.xml === RCS file: /home/cvs/gump/project/incubator-geronimo.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- incubator-geronimo.xml29 Jul 2004 18:09:23 - 1.4 +++ incubator-geronimo.xml29 Jul 2004 18:11:10 - 1.5 @@ -24,8 +24,7 @@ - - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project incubator-geronimo.xml
ajack 2004/07/29 11:09:23 Modified:project incubator-geronimo.xml Log: Fixed typo in notification. Revision ChangesPath 1.4 +1 -1 gump/project/incubator-geronimo.xml Index: incubator-geronimo.xml === RCS file: /home/cvs/gump/project/incubator-geronimo.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- incubator-geronimo.xml12 Mar 2004 23:10:22 - 1.3 +++ incubator-geronimo.xml29 Jul 2004 18:09:23 - 1.4 @@ -33,7 +33,7 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/07/29 07:50:48 Modified:repository cocoon.xml avalon-svn.xml profile gump.xml Log: Working on migrating Cocoon to SVN. [Fixed a typo in Avalon SVN repo definition.] Revision ChangesPath 1.3 +9 -12 gump/repository/cocoon.xml Index: cocoon.xml === RCS file: /home/cvs/gump/repository/cocoon.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cocoon.xml27 Feb 2004 08:56:58 - 1.2 +++ cocoon.xml29 Jul 2004 14:50:47 - 1.3 @@ -15,17 +15,14 @@ limitations under the License. --> - - Cocoon - http://cocoon.apache.org/ - http://cvs.apache.org/viewcvs/ + + Apache Cocoon + http://cocoon.apache.org + + + http://cvs.apache.org/viewcvs.cgi/cocoon/?root=Apache-SVN + + http://svn.apache.org/repos/asf/cocoon/ + - - -pserver -anoncvs -anoncvs -cvs.apache.org -/home/cvspublic - 1.2 +1 -1 gump/repository/avalon-svn.xml Index: avalon-svn.xml === RCS file: /home/cvs/gump/repository/avalon-svn.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avalon-svn.xml5 Jul 2004 08:32:22 - 1.1 +++ avalon-svn.xml29 Jul 2004 14:50:48 - 1.2 @@ -20,7 +20,7 @@ http://avalon.apache.org - http://cvs.apache.org/viewcvs.cgi/forrest/?root=Apache-SVN + http://cvs.apache.org/viewcvs.cgi/avalon/?root=Apache-SVN http://svn.apache.org/repos/asf/avalon/ 1.369 +1 -1 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- gump.xml 27 Jul 2004 13:25:48 - 1.368 +++ gump.xml 29 Jul 2004 14:50:48 - 1.369 @@ -34,7 +34,7 @@ - http://cvs.apache.org/viewcvs/~checkout~/cocoon-2.1/gump.xml"/> + http://svn.apache.org/repos/asf/cocoon/trunk/gump.xml"/> http://cvs.apache.org/viewcvs/~checkout~/cocoon-lenya/gump.xml"/> - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/build builder.py
ajack 2004/07/28 09:16:02 Modified:python/gump/runner runner.py python/gump/build builder.py Log: There were a few final tweaks... Revision ChangesPath 1.13 +0 -1 gump/python/gump/runner/runner.py Index: runner.py === RCS file: /home/cvs/gump/python/gump/runner/runner.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- runner.py 28 Jul 2004 15:50:29 - 1.12 +++ runner.py 28 Jul 2004 16:16:01 - 1.13 @@ -172,7 +172,6 @@ """ return self.java - # # Call a method called 'documentRun(run)' # 1.12 +1 -1 gump/python/gump/build/builder.py Index: builder.py === RCS file: /home/cvs/gump/python/gump/build/builder.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- builder.py28 Jul 2004 15:50:30 - 1.11 +++ builder.py28 Jul 2004 16:16:02 - 1.12 @@ -90,7 +90,7 @@ # Right now everything is Java.. -languageHelper=self.java +languageHelper=self.run.getJavaHelper() # Extract stats (in case we want to do conditional processing) stats=None - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/build builder.py
ajack 2004/07/28 08:50:30
Modified:python/gump preview.py
python/gump/runner runner.py
python/gump/notify notification.py notifier.py
python/gump/document/xdocs documenter.py
python/gump/document resolver.py
python/gump/run gumprun.py
python/gump/build builder.py
Log:
Restored 'preview' after JavaHelper refactor.
Revision ChangesPath
1.9 +5 -2 gump/python/gump/preview.py
Index: preview.py
===
RCS file: /home/cvs/gump/python/gump/preview.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- preview.py19 Jul 2004 16:07:53 - 1.8
+++ preview.py28 Jul 2004 15:50:29 - 1.9
@@ -77,8 +77,11 @@
if verbose:
# Show the workings
runner=getRunner(run)
+
+#
updater=runner.getUpdater()
builder=runner.getBuilder()
+languageHelper=runner.getJavaHelper()
for module in run.getGumpSet().getModules():
print SEPARATOR
@@ -96,7 +99,7 @@
print project.getXml()
project.dump()
if project.hasBuilder():
-builder.preview(project)
+builder.preview(project, languageHelper)
# Show any nasties...
if workspace.containsNasties():
1.12 +16 -1 gump/python/gump/runner/runner.py
Index: runner.py
===
RCS file: /home/cvs/gump/python/gump/runner/runner.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- runner.py 28 Jul 2004 01:26:08 - 1.11
+++ runner.py 28 Jul 2004 15:50:29 - 1.12
@@ -55,9 +55,15 @@
self.updater=GumpUpdater(run)
self.builder=GumpBuilder(run)
+
+# A helper per language/type
+# Note: All are Java right now...
+self.java=gump.java.helper.JavaHelper(run)
+
# Stash them for reference...
run.setUpdater(self.updater)
-run.setBuilder(self.builder)
+run.setBuilder(self.builder)
+run.setJavaHelper(self.java)
def initialize(self,exitOnError=True):
@@ -157,6 +163,15 @@
def getBuilder(self):
return self.builder
+
+def getJavaHelper(self):
+"""
+
+Return the language specific helper
+
+"""
+return self.java
+
#
# Call a method called 'documentRun(run)'
1.7 +19 -5 gump/python/gump/notify/notification.py
Index: notification.py
===
RCS file: /home/cvs/gump/python/gump/notify/notification.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notification.py 21 Jul 2004 14:54:34 - 1.6
+++ notification.py 28 Jul 2004 15:50:29 - 1.7
@@ -199,6 +199,9 @@
def resolveAnnotations(self, resolver, stream):
+"""
+Resolve any annotations on the entity
+"""
#
# Add an info/error/etc...
@@ -211,7 +214,10 @@
stream.write(' -%s- %s\n' % (upper(levelName(note.level)),
note.text))
def resolveWork(self, resolver, stream):
-
+"""
+Resolve any work entries on the entity
+"""
+
#
# Work
#
@@ -227,11 +233,17 @@
def resolveStats(self, resolver, stream):
+"""
+Resolve any stats on the entity
+"""
+
stats=self.entity.getStats()
stream.write('\n\n')
-def resolveSyndication(self, resolver, stream):
-
+def resolveSyndication(self, resolver, stream):
+"""
+Resolve syndication links on the entity
+"""
stream.write('\n')
stream.write('To subscribe to this information via syndicated feeds:')
stream.write('\n')
@@ -243,8 +255,10 @@
stream.write(' RSS: ' + rssurl + '\n')
stream.write(' Atom: ' + atomurl + '\n')
-def resolveFooter(self, resolver, id, stream):
-
+def resolveFooter(self, resolver, id, stream):
+"""
+R
cvs commit: gump/python/gump/build maven.py
ajack 2004/07/27 19:40:44 Modified:python/gump/build maven.py Log: I wish I knew the coverage of our unit tests. I know it isn't enough... Revision ChangesPath 1.11 +1 -1 gump/python/gump/build/maven.py Index: maven.py === RCS file: /home/cvs/gump/python/gump/build/maven.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- maven.py 28 Jul 2004 01:26:09 - 1.10 +++ maven.py 28 Jul 2004 02:40:43 - 1.11 @@ -68,7 +68,7 @@ # # Get the appropriate build command... # -cmd=self.getMavenCommand(languageHelper, project) +cmd=self.getMavenCommand(project,languageHelper) if cmd: # Execute the command - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/java helper.py
ajack 2004/07/27 19:00:07
Modified:python/gump/java helper.py
Log:
$JAVA_HOME/ *lib* /tools.jar -- need that lib.
Revision ChangesPath
1.2 +2 -1 gump/python/gump/java/helper.py
Index: helper.py
===
RCS file: /home/cvs/gump/python/gump/java/helper.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- helper.py 28 Jul 2004 01:26:09 - 1.1
+++ helper.py 28 Jul 2004 02:00:07 - 1.2
@@ -76,7 +76,8 @@
"""
sysClasspath=gump.java.cp.Classpath('System Classpath')
-syscp=os.path.join(self.run.getEnvironment().getJavaHome(),'tools.jar')
+javaHome=self.run.getEnvironment().getJavaHome()
+syscp=os.path.join(os.path.join(javaHome,'lib'),'tools.jar')
sysClasspath.importFlattenedParts(syscp)
return sysClasspath
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/build script.py
ajack 2004/07/27 18:48:32 Modified:python/gump/build script.py Log: Missed an argument to script building (found by bootstrap-ant). Revision ChangesPath 1.9 +4 -4 gump/python/gump/build/script.py Index: script.py === RCS file: /home/cvs/gump/python/gump/build/script.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- script.py 28 Jul 2004 01:26:09 - 1.8 +++ script.py 28 Jul 2004 01:48:32 - 1.9 @@ -53,7 +53,7 @@ """ gump.run.gumprun.RunSpecific.__init__(self,run) -def buildProject(self,project,stats): +def buildProject(self,project,languageHelper,stats): """ Run a project's script (a .bat or a .sh as appropriate) """ @@ -65,7 +65,7 @@ # # Get the appropriate build command... # -cmd=self.getScriptCommand(project) +cmd=self.getScriptCommand(project,languageHelper) if cmd: # Execute the command @@ -87,7 +87,7 @@ # For now, things are going good... project.changeState(STATE_SUCCESS) -def getScriptCommand(self,languageHelper,project): +def getScriptCommand(self,project,languageHelper): """ Return the command object for a
cvs commit: gump/python/gump/java - New directory
ajack 2004/07/27 18:25:02 gump/python/gump/java - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/test model.py
ajack 2004/07/23 08:23:33
Modified:python/gump/utils domutils.py
python/gump/model object.py property.py builder.py
python/gump/test/resources/full1 module1.xml module2.xml
project bsf.xml
python/gump/test model.py
Log:
Whew, tracking down the problem w/ blank properties took way more
time than it oughta...
Revision ChangesPath
1.5 +1 -1 gump/python/gump/utils/domutils.py
Index: domutils.py
===
RCS file: /home/cvs/gump/python/gump/utils/domutils.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- domutils.py 14 Jul 2004 23:36:28 - 1.4
+++ domutils.py 23 Jul 2004 15:23:33 - 1.5
@@ -163,7 +163,7 @@
def hasDomAttribute(element,name):
if element.hasAttributes():
-if element.getAttribute(name): return True
+return element.hasAttribute(name)
return False
def getDomAttributeValue(element,name,default=None):
1.27 +9 -7 gump/python/gump/model/object.py
Index: object.py
===
RCS file: /home/cvs/gump/python/gump/model/object.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- object.py 19 Jul 2004 16:07:56 - 1.26
+++ object.py 23 Jul 2004 15:23:33 - 1.27
@@ -67,7 +67,13 @@
self.resolutionPerformed=False
self.completionPerformed=False
-
+
+def __repr__(self):
+return str(self)
+
+def __str__(self):
+return self.__class__.__name__
+
def __del__(self):
Annotatable.__del__(self)
Workable.__del__(self)
@@ -151,8 +157,7 @@
# Helper methods
def hasDomAttribute(self,name):
-if hasDomAttribute(self.element,name): return True
-return False
+return hasDomAttribute(self.element,name)
def getDomAttributeValue(self,name,default=None):
return self.expandVariables(
@@ -302,10 +307,7 @@
def __hash__(self):
if self.hash: return self.hash
self.hash=hash(self.name)
-return self.hash
-
-def __repr__(self):
-return str(self)
+return self.hash
def __str__(self):
return self.__class__.__name__+':'+self.name
1.25 +41 -12gump/python/gump/model/property.py
Index: property.py
===
RCS file: /home/cvs/gump/python/gump/model/property.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- property.py 19 Jul 2004 16:07:56 - 1.24
+++ property.py 23 Jul 2004 15:23:33 - 1.25
@@ -20,32 +20,52 @@
from gump.model.object import *
from gump.utils.domutils import *
+from types import NoneType
# represents a element
class Property(NamedModelObject):
def __init__(self,name,dom,parent):
NamedModelObject.__init__(self,name,dom,parent)
- self.value=self.getDomAttributeValue('value')
+
+self.value=None
+
def setValue(self,value):
+"""
+Set a value for this property
+"""
self.value = value
def getValue(self):
+"""
+Get a value
+"""
return self.value
# provide default elements when not defined in xml
def complete(self,parent,workspace):
if self.isComplete(): return
+if self.hasDomAttribute('value'):
+self.value=self.getDomAttributeValue('value','')
+if not self.value:
+self.value=''
+else:
+self.value=None
+
# Properties are either on the workspace, or on
# an ant entry within a project. Pick workspace or project.
responsibleParty=workspace
if not parent==workspace: responsibleParty=parent.getOwner()
-project=self.getDomAttributeValue('project')
-
+# Get what this might refer to.
+project=self.getDomAttributeValue('project')
reference=self.getDomAttributeValue('reference')
+
+#
+# Do we have a reference to process?
+#
if reference=='home':
if not workspace.hasProject(project):
responsibleParty.addError('Cannot resolve
cvs commit: gump/profile gump.xml
ajack 2004/07/22 13:02:32 Modified:profile gump.xml Log: BSF 'package'. Revision ChangesPath 1.366 +1 -0 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.365 retrieving revision 1.366 diff -u -r1.365 -r1.366 --- gump.xml 22 Jul 2004 18:15:38 - 1.365 +++ gump.xml 22 Jul 2004 20:02:32 - 1.366 @@ -280,6 +280,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project bsf.xml
ajack 2004/07/22 12:50:54 Modified:project bsf.xml Log: Retry as a package. Revision ChangesPath 1.18 +4 -33 gump/project/bsf.xml Index: bsf.xml === RCS file: /home/cvs/gump/project/bsf.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bsf.xml 22 Jul 2004 19:15:13 - 1.17 +++ bsf.xml 22 Jul 2004 19:50:54 - 1.18 @@ -16,46 +16,17 @@ --> - http://jakarta.apache.org/bsf/ -"/> + http://jakarta.apache.org/bsf/"/> + -Bean Scripting Framework +Bean Scripting Framework -- the old IBM OSS one, prior to Jakarta. - - - - -org.apache.bsf - - - - - - - - + - - - - - - - - - - - - - - - - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project bsf.xml
ajack 2004/07/22 12:15:13 Modified:project bsf.xml Log: Migrate to Jakarta BSF (from OSS BSF) Revision ChangesPath 1.17 +7 -5 gump/project/bsf.xml Index: bsf.xml === RCS file: /home/cvs/gump/project/bsf.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- bsf.xml 27 Feb 2004 09:22:56 - 1.16 +++ bsf.xml 22 Jul 2004 19:15:13 - 1.17 @@ -16,16 +16,20 @@ --> - http://oss.software.ibm.com/developerworks/projects/bsf"/> + http://jakarta.apache.org/bsf/ +"/> Bean Scripting Framework - + + + -com.ibm.bsf +org.apache.bsf @@ -38,8 +42,6 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/profile gump.xml
ajack 2004/07/22 11:15:38 Modified:profile gump.xml Removed: project gump-test.xml Log: Removed gump-test (partly 'cos the SVN repository got blown away). Revision ChangesPath 1.365 +0 -2 gump/profile/gump.xml Index: gump.xml === RCS file: /home/cvs/gump/profile/gump.xml,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- gump.xml 22 Jul 2004 08:28:23 - 1.364 +++ gump.xml 22 Jul 2004 18:15:38 - 1.365 @@ -114,8 +114,6 @@ - - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/document/xdocs documenter.py
ajack 2004/07/21 21:20:33 Modified:python/gump/document/xdocs documenter.py Log: Count 'unbuilt dependencies' on pre-reqs, so we know how 'far' they are from being built, but do so *w/o* a side effect bug. Revision ChangesPath 1.22 +3 -2 gump/python/gump/document/xdocs/documenter.py Index: documenter.py === RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- documenter.py 21 Jul 2004 14:54:34 - 1.21 +++ documenter.py 22 Jul 2004 04:20:33 - 1.22 @@ -1095,9 +1095,10 @@ projectRow.createData(project.getFullDependencyCount()) +# Count unbuilt dependencies unbuilt=0 -for project in project.getFullDependencyProjectList(): -if not project.isSuccess(): +for dep in project.getFullDependencyProjectList(): +if not dep.isSuccess(): unbuilt+=1 projectRow.createData(unbuilt) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/model repository.py
ajack 2004/07/21 19:54:39
Modified:python/gump/update artifact.py
python/gump/test __init__.py launching.py stats.py timing.py
notifying.py utils.py pyunit.py
python/gump/notify notifier.py
python/gump/utils smtp.py
src/documentation/content/xdocs index.xml gettingstarted.xml
..cvsignore
python/gump/model repository.py
Log:
1) Some documentation work
2) Some unit testing related fixes
3) More debug on SMTP failures.
Revision ChangesPath
1.5 +21 -12gump/python/gump/update/artifact.py
Index: artifact.py
===
RCS file: /home/cvs/gump/python/gump/update/artifact.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- artifact.py 19 Jul 2004 16:07:55 - 1.4
+++ artifact.py 22 Jul 2004 02:54:38 - 1.5
@@ -16,7 +16,7 @@
# limitations under the License.
"""
-
+The artifact updater
"""
import os.path
@@ -53,10 +53,8 @@
RunSpecific.__init__(self,run)
def updateModule(self,module):
-"""
-
-Perform an Artifact update on a module
-
+"""
+Perform an Artifact update on a module
"""
log.info('Perform Artifact Update on #[' + `module.getPosition()` + \
'] : ' + module.getName())
@@ -70,9 +68,7 @@
# Execute the command and capture results
cmdResult=execute(cmd, module.getWorkspace().tmpdir)
-#
# Store this as work, on both the module and (cloned) on the repo
-#
work=CommandWorkItem(WORK_TYPE_UPDATE,cmd,cmdResult)
module.performedWork(work)
module.getRepository().performedWork(work.clone())
@@ -93,15 +89,16 @@
# Kinda bogus, but better than nowt (for now)
module.changeState(STATE_SUCCESS,REASON_UPDATE_FAILED)
else:
+self.mapArtifacts(module)
+
module.changeState(STATE_SUCCESS)
return module.okToPerformWork()
-def preview(self,module):
-command = self.getArtifactUpdateCommand(module)
-command.dump()
-
def getArtifactUpdateCommand(self,module):
+"""
+Create the Depot command line for updating this module.
+"""
log.debug("Artifact Update Module " + module.getName() + \
", Repository Name: " + str(module.repository.getName()))
@@ -139,4 +136,16 @@
cmd.addParameter(module.getName())
return cmd
-
+
+def mapArtifacts(self,module):
+"""
+Map the artifacts to jars ids (within projects)
+"""
+
+def preview(self,module):
+"""
+Preview the command
+"""
+command = self.getArtifactUpdateCommand(module)
+command.dump()
+
1.16 +1 -1 gump/python/gump/test/__init__.py
Index: __init__.py
===
RCS file: /home/cvs/gump/python/gump/test/__init__.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- __init__.py 19 Jul 2004 16:07:55 - 1.15
+++ __init__.py 22 Jul 2004 02:54:38 - 1.16
@@ -58,7 +58,7 @@
workspace=getTestWorkspace(xml)
# Load statistics for this workspace
-db=StatisticsDB(dir.test,'test.db')
+db=StatisticsDB(gump.core.config.dir.test,'test.db')
db.loadStatistics(workspace)
# Some file items...
1.2 +18 -0 gump/python/gump/test/launching.py
Index: launching.py
===
RCS file: /home/cvs/gump/python/gump/test/launching.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- launching.py 14 Jul 2004 20:47:02 - 1.1
+++ launching.py 22 Jul 2004 02:54:38 - 1.2
@@ -26,6 +26,24 @@
def __init__(self):
UnitTestSuite.__init__(self)
+def testSpacesInCommandLines(self):
+params=gump.process.command.Parameters()
+params.addParamet
cvs commit: gump/python/gump/document/xdocs documenter.py
ajack 2004/07/21 07:54:34
Modified:python/gump/model project.py module.py
.gumpy.py
python/gump/notify notification.py logic.py notifier.py
python/gump/document/xdocs documenter.py
Log:
More than a few notification fixes...
Revision ChangesPath
1.91 +15 -1 gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- project.py19 Jul 2004 20:34:00 - 1.90
+++ project.py21 Jul 2004 14:54:34 - 1.91
@@ -77,7 +77,7 @@
self.url=None
self.desc=''
-self.distributable=False
+self.redistributable=False
self.packageMarker=None
self.jvmargs=gump.process.command.Parameters()
self.packageNames=None
@@ -101,10 +101,24 @@
Positioned.__del__(self)
def hasNotifys(self):
+"""
+Does this project have any notification addresses, and if not
+does the module?
+
+boolean true if some
+"""
if self.notifys: return True
+if self.module: return self.module.hasNotifys()
return False
def getNotifys(self):
+"""
+ Return the list of notification addresses for this project
+ but if none, see if the module has any.
+"""
+if not self.notifys:
+if self.module:
+return self.module.getNotifys()
return self.notifys
def hasAnt(self):
1.49 +14 -4 gump/python/gump/model/module.py
Index: module.py
===
RCS file: /home/cvs/gump/python/gump/model/module.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- module.py 14 Jul 2004 23:36:28 - 1.48
+++ module.py 21 Jul 2004 14:54:34 - 1.49
@@ -15,7 +15,9 @@
# limitations under the License.
"""
-This module contains information on
+
+This module contains information on 1:
notification=gump.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')
1.11 +68 -26gump/python/gump/notify/notifier.py
Index: notifier.py
===
RCS file: /home/cvs/gump/python/gump/notify/notifier.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- notifier.py 19 Jul 2004 16:07:54 - 1.10
+++ notifier.py 21 Jul 2004 14:54:34 - 1.11
@@ -50,10 +50,15 @@
AbstractRunActor.__init__(self,run)
+# Successful notifications
+self.sents=0
+
+# Unsuccesful
self.unsent=''
self.unsentSubjects=''
self.unsents=0
+# Unwanted
self.unwanted=''
self.unwantedSubjects=''
self.unwanteds=0
@@ -62,25 +67,39 @@
self.logic=NotificationLogic(self.run)
self.id=0
-
+
+def processOtherEvent(self,event):
+"""
+
+At the end of the run...
+
+"""
+if isinstance(event,FinalizeRunEvent):
+self.processWorkspace()
+
def processWorkspace(self):
"""
+
Notify about the workspace (if it needs it)
+
"""
notification = self.logic.notification(self.workspace)
if notification:
self.notifyWorkspace(notification)
+log.info('Notifications: Sent:%s Unsent:%s Unwanted: %s' % \
+(self.sents, self.unsents, self.unwanteds) )
+
# Workspace can override...
(wsTo, wsFrom) = self.workspace.getNotifyOverrides()
# Belt and braces (notify to us i
cvs commit: gump/python/gump/process command.py launcher.py
ajack 2004/07/19 15:34:04
Modified:python/gump/process command.py launcher.py
Log:
The new launcher was failing to set/pass TIMEOUT, so none existed.
Revision ChangesPath
1.2 +1 -1 gump/python/gump/process/command.py
Index: command.py
===
RCS file: /home/cvs/gump/python/gump/process/command.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- command.py14 Jul 2004 20:47:01 - 1.1
+++ command.py19 Jul 2004 22:34:04 - 1.2
@@ -163,7 +163,7 @@
class Cmd:
"""Command Line (executable plus parameters)"""
-def __init__(self,command,name=None,cwd=None,env=None,timeout=None):
+def __init__(self,command,name=None,cwd=None,env=None,timeout=setting.timeout):
self.cmdpath=command
self.name=name
if not self.name:
1.5 +23 -10gump/python/gump/process/launcher.py
Index: launcher.py
===
RCS file: /home/cvs/gump/python/gump/process/launcher.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- launcher.py 19 Jul 2004 16:07:57 - 1.4
+++ launcher.py 19 Jul 2004 22:34:04 - 1.5
@@ -154,7 +154,7 @@
return result
-def killChildProcesses():
+def shutdownProcesses():
"""
Kill this (and all child processes).
"""
@@ -165,12 +165,14 @@
gumpid
except Exception, details:
log.error('Failed to dispatch signal ' + str(details), exc_info=1)
-
-if __name__=='__main__':
-import re
+
+def runProcess(execFilename):
+"""
-exit_code=0
-execFilename=sys.argv[1]
+Read an 'exec file' (formatted by Gump) to detect what to run,
+and how to run it.
+
+"""
execFile=None
try:
execFile=file(execFilename,'r')
@@ -186,8 +188,8 @@
cwd=None
if execInfo.has_key('CWD'):cwd=execInfo['CWD']
tmp=execInfo['TMP']
-timeout=None
-if execInfo.has_key('TIMEOUT'):timeout=execInfo['TIMEOUT']
+timeout=0
+if execInfo.has_key('TIMEOUT'):timeout=int(execInfo['TIMEOUT'])
# Make the TMP if needed
if not os.path.exists(tmp): os.makedirs(tmp)
@@ -206,8 +208,8 @@
# Timeout support
timer=None
if timeout:
-import thread
-timer = thread.Timer(timeout, killChildProcesses)
+import threading
+timer = threading.Timer(timeout, shutdownProcesses)
timer.setDaemon(1)
timer.start()
@@ -236,6 +238,17 @@
finally:
if execFile: execFile.close()
+
+return exit_code
+
+if __name__=='__main__':
+import re
+
+exit_code=0
+execFilename=sys.argv[1]
+
+# Run the information within this file...
+exit_code=runProcess(execFilename)
# print 'Exit: ' + `exit_code`
sys.exit(exit_code)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/model project.py misc.py
ajack 2004/07/19 13:34:01
Modified:python/gump/model project.py misc.py
Log:
Found another use of DOM after complete(). Zapped it, and others like it.
Revision ChangesPath
1.90 +4 -0 gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- project.py19 Jul 2004 19:57:57 - 1.89
+++ project.py19 Jul 2004 20:34:00 - 1.90
@@ -421,22 +421,26 @@
# Grab all the work
for w in self.getDomChildIterator('work'):
work=Work(w,self)
+work.complete()
self.works.append(work)
# Grab all the mkdirs
for m in self.getDomChildIterator('mkdir'):
mkdir=Mkdir(m,self)
+mkdir.complete()
self.mkdirs.append(mkdir)
# Grab all the deleted
for d in self.getDomChildIterator('delete'):
delete=Delete(d,self)
+delete.complete()
self.deletes.append(delete)
# Grab all the reports (junit for now)
if self.hasDomChild('junitreport'):
junitreport=self.getDomChild('junitreport')
report=JunitReport(junitreport,self)
+report.complete()
self.reports.append(report)
# Grab all notifications
1.3 +60 -30gump/python/gump/model/misc.py
Index: misc.py
===
RCS file: /home/cvs/gump/python/gump/model/misc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- misc.py 8 Jul 2004 20:33:07 - 1.2
+++ misc.py 19 Jul 2004 20:34:01 - 1.3
@@ -130,22 +130,32 @@
return self.type
class Resolvable(ModelObject):
+"""
+A ModelObject that can be resolved relative to it's owning model or workspace
+e.g. JUnitReport or Work
+"""
def __init__(self,dom,owner):
-ModelObject.__init__(self,dom,owner)
+ModelObject.__init__(self,dom,owner)
+self.path=None
+
+def complete(self):
+if self.isComplete(): return
-def getResolvedPath(self):
-path=None
if self.hasDomAttribute('nested'):
-path=os.path.abspath(
-os.path.join(self.owner.getModule().getWorkingDirectory(),
+self.path=os.path.abspath(
+os.path.join(self.owner.getModule().getWorkingDirectory(),
self.getDomAttributeValue('nested')))
elif self.hasDomAttribute('parent'):
-path=os.path.abspath(
+self.path=os.path.abspath(
os.path.join(self.owner.getWorkspace().getBaseDirectory(),
self.getDomAttributeValue('parent')))
-return path
+# Done, don't redo
+self.setComplete(True)
+
+def getResolvedPath(self):
+return self.path
# represents a element
class JunitReport(Resolvable):
@@ -165,12 +175,10 @@
"""
def __init__(self,dom,owner):
ModelObject.__init__(self,dom,owner)
-
-def hasDirectory(self):
-return self.hasDomAttribute('dir')
-
-def getDirectory(self):
-path=None
+self.dir=None
+
+def complete(self):
+if self.isComplete(): return
if self.hasDomAttribute('dir'):
dirString=self.getDomAttributeValue('dir')
@@ -182,11 +190,26 @@
dirString, self.__class__.__name__)
dirString='bogus'
-path=os.path.abspath(
-os.path.join(self.owner.getModule().getWorkingDirectory(),
-dirString))
-
-return path
+self.dir=os.path.abspath(
+os.path.join( self.owner.getModule().getWorkingDirectory(),
+dirString))
+
+# Done, don't redo
+self.setComplete(True)
+
+def hasDirectory(self):
+"""
+Does it have a directory?
+
