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 @@ -?xml version=1.0 encoding=ISO-8859-1? -!-- - 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. --- -!DOCTYPE document PUBLIC -//APACHE//DTD Documentation V1.1//EN document-v11.dtd -document - - header - -titleGump/title - authorsperson name=Sam Ruby email=[EMAIL PROTECTED]//authors/header - -body - - sectiontitlerepository/title -pThis represents the location from which modules can be obtained./p - -table - tr -thAttribute/th -thDescription/th -thRequired?/th - /tr - tr -tdname/td -tdName by which this repository will be referenced by module - definitions. -/td -tdYes/td - /tr - tr -tdtype/td -tdType of repository./td - tdstrongcvs/strong,strongsvn/strong,strongjars/strong,strongp4/strong currently supported./td - /tr - tr -tdcompress/td -tdSet the compression level. Some CVS client/server combinations - will not work with compression./td -tdNo, defaults to code-z3/code./td - /tr -/table -p/ - -table - tr -thEntity/th -thDescription/th -thRequired?/th - /tr - tr -tdtitle/td -tdDescriptive name for the repository/td -tdNo/td - /tr - tr -tdhome-page/td -tdWhere to find out more information about the repository/td -tdNo/td - /tr - tr -tdcvsweb/td -tdWeb interface to the repository. strongTo be deprecated, see lt;web./strong/td -tdNo/td - /tr - tr -tdweb/td -tdWeb interface to the repository. (More appropriate for multiple types)./td -tdNo/td - /tr - tr -tdredistributable/td -tdAre the outputs of this build redistributable?/td -tdNo/td - /tr -/table -p/ - - section - titleCVS Usage/title - sectiontitleroot/title - noteThis is for type='cvs' only./note - pThis 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./p - - table -tr - thEntity/th - thDescription/th - thRequired?/th -/tr -tr - tdmethod/td - td/ - tdYes/td -/tr -tr - tduser/td - td/ - tdNo/td -/tr -tr - tdpassword/td - td/ - tdNo/td -/tr -tr - tdhostname/td - td/ - tdNo/td -/tr -tr - tdpath/td - td/ - tdYes/td -/tr - /table -/section - /section - section - titlePerforce Usage/title - sectiontitleroot/title - noteThis is for type='p4' only./note - pThis 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./p - - table -tr - thEntity/th
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 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 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 dotnet framework=mono-1.0.1 / 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]
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 === ?xml version=1.0? !-- 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. -- workspace name=gump-n basedir=/data/gump-n jardir=/data/gump-n/assemlibies/latest pkgdir=/data/package version=0.4 profile href=profile/gump-n.xml/ /workspace 1.1 gump/project/nant.xml Index: nant.xml === ?xml version=1.0 ? !-- Copyright 2001-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. -- module name=nant url href=http://nant.sourceforge.net// description 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. /description redistributable/ cvs repository=sourceforge dir=nant/ project name=nant language=csharp packageorg.nant/package nant/ home parent=dist// jar name=junit.jar id=junit/ /project /module 1.1 gump/profile/gump-n.xml Index: gump-n.xml === ?xml version=1.0 ? !-- Copyright 2001-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. -- profile name=gump-n !-- SourceForge -- module href=project/nant.xml/ !-- SVN Repository definitions -- !-- CVS Repository definitions -- repository href=repository/sourceforge.xml/ !-- server definitions -- server href=server/brutus.xml/ !-- tracker definitions -- tracker href=tracker/apache-jira.xml/ /profile - 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 license name='...
@@ -338,16 +338,16 @@
self.checkPackage(project)
-if project.hasOutputs():
+if project.hasAnyOutputs():
outputs = []
-# Ensure the jar output were all generated correctly.
-for jar in project.getJars():
-jarPath=os.path.abspath(jar.getPath())
+# Ensure the output output were all generated correctly.
+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)
+outputs.append(outputPath)
# If we have a license name='...
if project.hasLicense():
@@ -384,19 +384,19 @@
if project.okToPerformWork():
# Check the package was installed correctly...
outputsOk=1
-for jar in project.getJars():
-jarpath=jar.getPath()
-if jarpath:
-if not os.path.exists(jarpath):
+for output in project.getOutputs():
+outputpath=output.getPath()
+if outputpath:
+if not os.path.exists(outputpath):
project.changeState(STATE_FAILED,REASON_PACKAGE_BAD)
outputsOk=False
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 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:
+module.addError('*** Failed to update from source control. Stale
contents ***')
+
+# Black mark for this repository
+repository=module.getRepository
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 nant metadata
select targets and build files as appropriate.
@@ -117,26 +115,22 @@
# Get system
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(Statistics):
@@ -698,4 +776,4 @@
# Track code updates/changes
#
if module.isModified():
-self.lastModified=default.datetime
\ No newline at end of file
+self.lastModified
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 @@ project name=jms package=jms1.0.2/ project name=jmx package=jmx-1_2-ri/ project name=jndi package=jndi1_2_1/ - project name=jsch package=jsch-0.1.14/ + project name=jsch package=jsch-0.1.16/ project name=jsse package=jsse1.0.3/ project name=jta package=jta-spec1_0_1/ project name=junitperfpackage=junitperf-1.8/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
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 builder (uses nant to build projects)
+
+
+import os.path
+import sys
+
+from gump import log
+from
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/runner/runner.py Mon Aug 30 16:57:49 2004
@@ -157,6 +157,15 @@
if self.run.getOptions().isSyndicate():
self.run.registerActor(Syndicator(self.run))
+# Describe [once documented]
+if self.run.getOptions().isDescribe():
+try
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]
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 @@ project name=tranquilopackage=xsdlib-20010424/ project name=nsumlpackage=nsuml/ project name=packaged-jaxen package=jaxen-1.0-FCS/ - project name=packaged-jetty package=Jetty-5.0.beta2/ + project name=packaged-jetty package=jetty-5.0.RC2/ project name=resinpackage=resin-3.0.8/ project name=jetty4 package=jetty-4.2.21/ project name=saxpath package=jaxen-1.0-FCS/ 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 @@ /description project name=packaged-jetty -packageorg.mortbay/package +packageorg.mortbay.jetty/package jar name=lib/org.mortbay.jetty.jar/ +license name=LICENSE.html/ + /project + + project name=packaged-jetty-all +packageorg.mortbay.jetty/package + +jar name=lib/org.mortbay.jetty.jar/ +jar name=lib/org.mortbay.jetty.plus.jar/ +jar name=lib/org.mortbay.jetty.jaas.jar/ license name=LICENSE.html/ /project - 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 @@ project name=nsumlpackage=nsuml/ project name=packaged-jaxen package=jaxen-1.0-FCS/ project name=packaged-jetty package=jetty-5.0.RC2/ + project name=packaged-jetty-all package=jetty-5.0.RC2/ + project name=packaged-jetty-jaas package=jetty-5.0.RC2/ project name=resinpackage=resin-3.0.8/ project name=jetty4 package=jetty-4.2.21/ project name=saxpath package=jaxen-1.0-FCS/ - 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 @@ packageorg.mortbay.jetty/package jar name=lib/org.mortbay.jetty.jar/ -jar name=lib/org.mortbay.jetty.plus.jar/ -jar name=lib/org.mortbay.jetty.jaas.jar/ +jar name=extra/lib/org.mortbay.jetty.plus.jar/ +jar name=extra/lib/org.mortbay.jetty.jaas.jar/ license name=LICENSE.html/ /project project name=packaged-jetty-jaas packageorg.mortbay.jetty/package -jar name=lib/org.mortbay.jetty.jaas.jar/ +jar name=extra/lib/org.mortbay.jetty.jaas.jar/ license name=LICENSE.html/ /project - 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 @@ jar name=lib/org.mortbay.jetty.jar/ jar name=extra/lib/org.mortbay.jetty.plus.jar/ -jar name=extra/lib/org.mortbay.jetty.jaas.jar/ +jar name=extra/lib/org.mortbay.jaas.jar/ license name=LICENSE.html/ /project project name=packaged-jetty-jaas packageorg.mortbay.jetty/package -jar name=extra/lib/org.mortbay.jetty.jaas.jar/ +jar name=extra/lib/org.mortbay.jaas.jar/ license name=LICENSE.html/ /project - 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 @@ +HTML + BODY + This directory contains PSP (Python Server Pages). + + UL + LI + A HREF=test.psptest/A + /LI + /UL + /BODY +/HTML \ No newline at end of file - 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 string
+import time
+import os
+import sys
+import logging
+
+from gump import log
+from gump.core.config import *
+from gump.run.gumprun import *
+from gump.run.actor import AbstractRunActor
+from gump.model.project import *
+from gump.model.module import *
+from gump.model.state import *
+from gump.utils import *
+
+from rdflib.URIRef import
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 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 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 (c) 1999-2004 Apache Software Foundation +__license__ = http://www.apache.org/licenses/LICENSE-2.0; + + # # $Header: /home/stefano/cvs/gump/python/gump/preview.py,v 1.9 2004/07/28 15:50:29 ajack Exp $ # Modified: gump/trunk/bin/redo.py == --- gump/trunk/bin/redo.py (original
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_SYNDICATEFEATURE_DOCUMENTFEATURE_NOTIFY +FEATURE_DEFAULT=FEATURE_SYNDICATE|FEATURE_DOCUMENT|FEATURE_NOTIFY -FEATURE_ALL=FEATURE_STATISTICSFEATURE_RESULTSFEATURE_NOTIFYFEATURE_DIAGRAM\ -FEATURE_SYNDICATEFEATURE_PUBLISHFEATURE_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 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 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 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('/rss\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]
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 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]
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 @@ depend project=ant/ depend project=jetty inherit=all/ +depend project=jta/ + work nested=extra/plus/classes/ + jar name=lib/org.mortbay.jetty.plus.jar/ jar name=lib/org.mortbay.jaas.jar/ license name=LICENSE.TXT/ - 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:37 2004
@@ -189,7 +189,7 @@
if gumpOptions.isUpdate():
# W/ multiple project in one module, it may be done
if not module.isUpdated():
-log.debug('Update module *inlined
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/ project name=jetty -packageorg.mortbay/package +packageorg.mortbay.jetty/package ant target=jetty.jar/ @@ -38,6 +38,19 @@ work nested=classes/ jar name=lib/org.mortbay.jetty.jar/ +license name=LICENSE.TXT/ + /project + + project name=jetty-plus +packageorg.mortbay.jetty.plus/package + +ant target=jars basedir=extra/plus/ + +depend project=ant/ +depend project=jetty inherit=all/ +work nested=extra/plus/classes/ +jar name=lib/org.mortbay.jetty.plus.jar/ +jar name=lib/org.mortbay.jaas.jar/ license name=LICENSE.TXT/ /project - 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]
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)
-if project.isFailed():
-log.warn('Failed to build project #[' + `project.getPosition()` + '] : ['
+ project.getName() + '], state
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 @@ depend project=junit/ depend project=xml-xerces/ depend project=xml-apis/ +depend project=tagsoup/ depend project=jakarta-servletapi-5-servlet/ work nested=lib/normalizer.jar/ jar name=build/xom-@@DATE@@.jar/ -nag - regexp -from=Elliotte Harold lt;[EMAIL PROTECTED]gt; -to=[EMAIL PROTECTED]/ - regexp -from=lt;[EMAIL PROTECTED]gt; -to=[EMAIL PROTECTED]/ -/nag +nag from=Elliotte Harold lt;[EMAIL PROTECTED]gt; + to=[EMAIL PROTECTED]/ +nag from=lt;[EMAIL PROTECTED]gt; + to=[EMAIL PROTECTED]/ /project /module 1.1 gump/project/tagsoup.xml Index: tagsoup.xml === ?xml version=1.0 ? !-- Copyright 2001-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. -- module name=tagsoup descriptionA 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./description url href=http://mercury.ccil.org/~cowan/XML/tagsoup// project name=tagsoup packageorg.ccil.cowan.tagsoup/package jar name=tagsoup-0.9.7.jar/ /project /module 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 @@ project name=saxonpackage=saxon7-9/ project name=saxon6 package=saxon6_5_3/ project name=stax package=stax/ + project name=tagsoup package=tagsoup-0.9.7/ project name=packaged-dom4j package=dom4j-1.4/ - 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 @@ depend project=xml-xerces/ depend project=commons-collections/ +depend project=commons-beanutils-core/ depend project=commons-digester/ depend project=commons-lang/ depend project=commons-logging/ - 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 @@ PThe artifacts in this directory are explicitly BNOT/B supported by the Apache Sopftware Foundation. These artifacts are not trusted, since they are built by an untrusted build process. Do BNOT/B use these artifacts for any purposes other than Gumping./P -PFor more information contact the A HREF=http://gump.apache.org;Gump Team/A at A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/A/P \ No newline at end of file +PThis repository contains arbitrary code downloaded from third party sites and may include dangerous root kits, use at your own risk./P + +P + For more information contact the A HREF=http://gump.apache.org;Gump Team/A at A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/A/P \ No newline at end of file - 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 @@
PThe artifacts in this directory are explicitly BNOT/B supported by the Apache
Sopftware Foundation. These artifacts are not trusted, since they are built by an
untrusted build process. Do BNOT/B use these artifacts for any purposes other than
Gumping./P
-PThis repository contains arbitrary code downloaded from third party sites and may
include dangerous root kits, use at your own risk./P
+PThis repository contains arbitrary code downloaded from third party sites and may
include dangerous root kits, Buse at your own risk/B./P
P
For more information contact the A HREF=http://gump.apache.org;Gump
Team/A at A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/A/P
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 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 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 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 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]
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 @@ depend project=ant inherit=runtime/ depend project=bsf/ + depend project=xml-xmlbeans-v1/ depend project=xml-xerces/ mkdir dir=build/classes/ - 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 @@ packageorg.apache.xerces/package ant basedir=java target=jars/ -depend project=xml-crimson / depend project=bootstrap-ant/ depend project=xjavac/ home nested=java/build/ - 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]
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 @@
sectiontitleJar Downloading/title
pThis is optional./p
ul
- liRuper -- fork href=http://incubator.apache.org/depot;Depot
Updater/fork/li
+ liDepot -- fork href=http://incubator.apache.org/depot;Depot
Updater/fork/li
/ul
/section
/section
/section
-sectiontitleGetting the source to Gump/title
+sectiontitleGetting the source/metadata for Gump/title
+ sectiontitleGetting the source/title
+ pGump source code resides in Subversion fork
href=http://cvs.apache.org/viewcvs.cgi/gump/?root=Apache-SVN;here/fork./p
source
+ svn checkout https://svn.apache.org/repos/asf/gump/trunk/ gump
+ /source
+ pThis checks out the source code into a sub-directory called
stronggump/strong.
+ Export $GUMP_HOME to (fully qualified) point to that directory./p
+ /section
+ sectiontitleGetting the metadata/title
+
+ pThe shared Gump metadata resides in CVS fork
href=http://cvs.apache.org/viewcvs.cgi/gump/;here/fork./p
+ source
+ cd gump
export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
cvs login
cvs co -d metadata gump
/source
-
- pIf prompted for the password, enter stronganoncvs/strong/p
+ /section
+ pIf prompted for the password, enter stronganoncvs/strong./p
+ pThis checks out the metadata into a sub-directory called metadata, under
gump./p
/section
sectiontitleDefining your workspace/title
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.
/p
- warning
-link href=traditional/index.htmlTraditional Gump/link is undergoing a
re-write into link
href=http://nagoya.apache.org/wiki/apachewiki.cgi?GumpPython;Python/link, see
-link href=python/index.htmlPython Gump/link. Be aware that some of this
documentation might be in transition,
-or state traditional information (when Python information difers.) strongPlease
report any such findings to us/strong.
- /warning
-
p
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 @@
gump label=Gump
index href=index.html label=Home/
status href=status.html label=Status/
- source href=http://cvs.apache.org/viewcvs/gump/; label=Source/
+ source href=http://cvs.apache.org/viewcvs/gump/?root=Apache-SVN;
label=Source/
+ source href=http://cvs.apache.org/viewcvs/gump/; label=Metadata/
faq href=http://wiki.apache.org/gump/FrequentlyAskedQuestions;
label=FAQ/
gettingstarted href=gettingstarted.html label=Getting Started/
todo href=todo.html label=Help Wanted/
Modified: gump/trunk
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 @@ depend project=xsdlib/ depend project=relaxng/ depend project=stax/ -depend project=jtidy/ depend project=junitperf/ depend project=ws-jaxme ids=api/ - 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 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]
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 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 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 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 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 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 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[1] in ['-w','--workspace']:
+workspaceName=args[2]
+del args[1:3]
+workspacePath = os.path.abspath(workspaceName)
+
+# Nope, can't find the workspace...
+if not os.path.exists(workspacePath):
+raise RuntimeError('No such workspace at ' + str(workspacePath))
+
+# Command has to be given
+if len(args)0
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]
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. -- -repository name=cocoon type=cvs - titleCocoon/title - home-pagehttp://cocoon.apache.org//home-page - cvswebhttp://cvs.apache.org/viewcvs//cvsweb +repository name=cocoon type=svn + titleApache Cocoon/title + home-pagehttp://cocoon.apache.org/home-page + + !-- Bogus, need to rename just use url below -- + cvswebhttp://cvs.apache.org/viewcvs.cgi/cocoon/?root=Apache-SVN/cvsweb + + urlhttp://svn.apache.org/repos/asf/cocoon//url + redistributable/ - - root -methodpserver/method -useranoncvs/user -passwordanoncvs/password -hostnamecvs.apache.org/hostname -path/home/cvspublic/path - /root /repository 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 @@ home-pagehttp://avalon.apache.org/home-page !-- Bogus, need to rename just use url below -- - cvswebhttp://cvs.apache.org/viewcvs.cgi/forrest/?root=Apache-SVN/cvsweb + cvswebhttp://cvs.apache.org/viewcvs.cgi/avalon/?root=Apache-SVN/cvsweb urlhttp://svn.apache.org/repos/asf/avalon//url 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 @@ !-- Apache.Cocoon -- - module href=http://cvs.apache.org/viewcvs/~checkout~/cocoon-2.1/gump.xml/ + module href=http://svn.apache.org/repos/asf/cocoon/trunk/gump.xml/ module href=http://cvs.apache.org/viewcvs/~checkout~/cocoon-lenya/gump.xml/ !-- Apache.DB -- - 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 @@ depend project=junit/ depend project=mx4j/ depend project=xml-xerces/ -nag to=[EMAIL PROTECTED] +nag to=[EMAIL PROTECTED] from=Davanum Srinivas lt;[EMAIL PROTECTED]gt;/ /project - 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 @@ cvs repository=incubator/ project name=incubator-geronimo -maven goal=default -/maven +maven target=jar/ !-- Since Maven is installed, not built, this isn't strictly neccessary. [yet] depend project=maven inherit=runtime/ -- - 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):
+
+Resolve footer (Gump identification information)
+
stream.write('\n\n--\n')
if id:
stream.write('Gump E-mail Identifier (within run) #%s.\n' % id )
1.13 +8 -2 gump/python/gump/notify/notifier.py
Index: notifier.py
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/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/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/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 property/ 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 homedir of *unknown* [' +
project + ']')
@@ -61,8 +81,8 @@
elif reference=='jarpath' or reference=='jar
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 @@ module href=project/jakarta-velocity-tools.xml/ module href=project/jakarta-velocity-dvsl.xml/ module href=project/jakarta-watchdog.xml/ - - module href=project/gump-test.xml/ !-- Apache.Logging -- module href=project/logging-log4j.xml/ - 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 @@ -- module name=bsf - url href=http://oss.software.ibm.com/developerworks/projects/bsf/ + url href=http://jakarta.apache.org/bsf/ +/ description Bean Scripting Framework /description redistributable/ - cvs repository=devworks dir=bsf/ + cvs repository=jakarta dir=jakarta-bsf/ + nag to=[EMAIL PROTECTED] + from=Sam Ruby lt;[EMAIL PROTECTED]gt;/ + project name=bsf -packagecom.ibm.bsf/package +packageorg.apache.bsf/package ant target=samples/ @@ -38,8 +42,6 @@ license name=license.html/ -nag to=[EMAIL PROTECTED] - from=Sam Ruby lt;[EMAIL PROTECTED]gt;/ /project project name=dist-bsf - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
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 @@ project name=cos package=cos-05Nov2002/ project name=cryptix package=cryptix32-20001002-r3.2.0/ project name=commons-codec-11 package=commons-codec-1.1/ + project name=bsf package=bsf/ project name=ejb package=ejb-2_0-fr/ !--project name=fesi package=fesi/-- project name=hibernatepackage=hibernate-2.1/ - 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 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 module and it's repository references.
+
from time import localtime, strftime, tzname
@@ -175,7 +177,8 @@
self.svn=None
self.artifacts=None
-self.packaged= False
+self.packaged= False
+self.redistributable= False
# Changes were found (when updating)
self.modified = False
@@ -221,6 +224,10 @@
return object
def resolve(self):
+
+ Resolving requires creating objects (in the correct lists/maps) for
+ certain high level XML elements, e.g. project.
+
if self.isResolved(): return
@@ -406,6 +413,9 @@
if self.hasDomChild('description'):
self.desc=self.getDomChildValue('description')
+
+# Existence means 'true'
+self.redistributable=self.hasDomChild('redistributable')
# For prettiness
self.sortedProjects=createOrderedList(self.getProjects())
@@ -469,8 +479,8 @@
def isRedistributable(self):
# Existence means 'true'
-return self.hasDomChild('redistributable') \
-or (self.repository and self.repository.isRedistributable())
+return self.redistributable or \
+(self.repository and self.repository.isRedistributable())
#
# Get a full list of all the projects that depend
1.40 +3 -3 gump/gumpy.py
Index: gumpy.py
===
RCS file: /home/cvs/gump/gumpy.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gumpy.py 19 Jul 2004 16:07:53 - 1.39
+++ gumpy.py 21 Jul 2004 14:54:34 - 1.40
@@ -264,7 +264,7 @@
pass
# Enable a log
-logFileName='gumpy_log.txt'
+logFileName='gumpy_log_' + time.strftime('%d%m%Y_%H%M%S') + '.txt'
logFile=os.path.abspath(logFileName)
log=open(logFile,'w',0) # Unbuffered...
@@ -458,7 +458,7 @@
# Publish logfile
published=0
if logdir:
-publishedLogFile=os.path.abspath(os.path.join(logdir,logFileName))
+publishedLogFile=os.path.abspath(os.path.join(logdir,'gumpy_log.txt'))
if '--xdocs' in args:
publishedLogFile=os.path.abspath(
os.path.join(
@@ -479,7 +479,7 @@
if result
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.addParameter('NoSpaces', 'a','=')
+params.addParameter('WithValueSpaces', 'aa aa a','=')
+params.addParameter('With Name Spaces', 'a','=')
+params.addParameter('WithQuotesAndSpaces', 'aa \' \ aa a','=')
+params.addParameter
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/svg depdiag.py
ajack 2004/07/19 09:07:59 Modified:python/gump/performance gurus.py deps.py xdocs.py .gumpy.py python/gump/results resulter.py python/gump/timing keeper.py python/gump update.py build.py integrate.py check.py env.py preview.py __init__.py python/gump/notify logic.py notifier.py notification.py python/gump/syndication syndicator.py abstract.py python/gump/test integrator.py notifying.py __init__.py documenter.py resulting.py syndicator.py python/gump/document/xdocs resolver.py xdoc.py documenter.py python/gump/update svn.py updater.py cvs.py artifact.py python/gump/document/text resolver.py python/gump/repository publisher.py python/gump/model object.py property.py builder.py project.py depend.py python/gump/document documenter.py resolver.py python/gump/core __init__.py commandLine.py python/gump/stats statistician.py python/gump/gui view.py python/gump/runner demand.py tasks.py template/forrest/content/xdocs site.xml python/gump/process launcher.py python/gump/utils note.py python/gump/build maven.py ant.py builder.py script.py abstract.py python/gump/svg depdiag.py Added: python/gump redo.py python/gump/run gumprun.py .cvsignore __init__.py gumpset.py gumpenv.py options.py actor.py Removed: python/gump debug.py python/gump/core actor.py gumprun.py gumpenv.py gumpset.py options.py Log: Commit retry... [modem woes, I guess.] 1) Moved 'run stuff' to it's own directory (to work on splitting out context from model in tree). 2) Consolidated some pages (to not waste links up top of pages) and not give practically empty pages. 3) Renamed debug.py (the script to update and build) to redo.py. Can't think of a really good name for those two actions. 4) Get gumpy.py to delete *.pyc for us (prior to CVS update) 5) Restored 'timeout' to lanching (lost it when went 'threadsafe'), prior to adding support for 'process groups' (to kill children). Removed 'timeout.c' usage. 6) Removed obsolete check for pgrep, no longer used. Revision ChangesPath 1.3 +1 -1 gump/python/gump/performance/gurus.py http://cvs.apache.org/viewcvs/gump/python/gump/performance/gurus.py.diff?r1=1.2r2=1.3 1.3 +1 -1 gump/python/gump/performance/deps.py http://cvs.apache.org/viewcvs/gump/python/gump/performance/deps.py.diff?r1=1.2r2=1.3 1.3 +1 -1 gump/python/gump/performance/xdocs.py http://cvs.apache.org/viewcvs/gump/python/gump/performance/xdocs.py.diff?r1=1.2r2=1.3 1.39 +13 -1 gump/gumpy.py http://cvs.apache.org/viewcvs/gump/gumpy.py.diff?r1=1.38r2=1.39 1.27 +1 -1 gump/python/gump/results/resulter.py http://cvs.apache.org/viewcvs/gump/python/gump/results/resulter.py.diff?r1=1.26r2=1.27 1.4 +6 -6 gump/python/gump/timing/keeper.py http://cvs.apache.org/viewcvs/gump/python/gump/timing/keeper.py.diff?r1=1.3r2=1.4 1.31 +4 -3 gump/python/gump/update.py http://cvs.apache.org/viewcvs/gump/python/gump/update.py.diff?r1=1.30r2=1.31 1.51 +4 -4 gump/python/gump/build.py http://cvs.apache.org/viewcvs/gump/python/gump/build.py.diff?r1=1.50r2=1.51 1.31 +5 -5 gump/python/gump/integrate.py http://cvs.apache.org/viewcvs/gump/python/gump/integrate.py.diff?r1=1.30r2=1.31 1.47 +8 -8 gump/python/gump/check.py http://cvs.apache.org/viewcvs/gump/python/gump/check.py.diff?r1=1.46r2=1.47 1.3 +1 -1 gump/python/gump/env.py http://cvs.apache.org/viewcvs/gump/python/gump/env.py.diff?r1=1.2r2=1.3 1.8 +5 -5 gump/python/gump/preview.py http://cvs.apache.org/viewcvs/gump/python/gump/preview.py.diff?r1=1.7r2=1.8 1.25 +3 -3 gump/python/gump/__init__.py http://cvs.apache.org/viewcvs/gump/python/gump/__init__.py.diff?r1=1.24r2=1.25 1.1 gump/python/gump/redo.py http://cvs.apache.org/viewcvs/gump/python/gump/redo.py?rev=1.1 1.6 +8 -14 gump/python/gump/notify/logic.py http://cvs.apache.org/viewcvs/gump/python/gump/notify/logic.py.diff?r1=1.5r2=1.6 1.10 +2 -2 gump/python/gump/notify/notifier.py http://cvs.apache.org/viewcvs/gump/python/gump/notify/notifier.py.diff?r1=1.9r2=1.10 1.5 +39 -13gump/python/gump/notify/notification.py http://cvs.apache.org/viewcvs/gump/python/gump/notify/notification.py.diff?r1=1.4r2=1.5 1.1
cvs commit: gump/python/gump/guru xref.py
ajack 2004/07/19 12:57:57
Modified:python/gump/model project.py
python/gump/guru xref.py
Log:
Found xref was using DOM after it had been closed down. Fixed.
Revision ChangesPath
1.89 +18 -1 gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- project.py19 Jul 2004 16:07:56 - 1.88
+++ project.py19 Jul 2004 19:57:57 - 1.89
@@ -80,6 +80,7 @@
self.distributable=False
self.packageMarker=None
self.jvmargs=gump.process.command.Parameters()
+self.packageNames=None
#
# Outputs
@@ -190,6 +191,13 @@
def getJars(self):
return self.jars.values()
+def hasPackageNames(self):
+if self.packageNames: return True
+return False
+
+def getPackageNames(self):
+return self.packageNames
+
def getJarAt(self,index):
return self.jars.values()[index]
@@ -512,7 +520,16 @@
# Existence means 'true'
self.redistributable=self.hasDomChild('redistributable')
-
+
+# Store any 'Java Package names'
+for pdom in self.getDomChildIterator('package'):
+packageName=getDomTextValue(pdom)
+if packageName:
+if not self.packageNames:
+self.packageNames=[]
+if not packageName in self.packageNames:
+self.packageNames.append(packageName)
+
# Close down the DOM...
self.shutdownDom()
1.4 +11 -16gump/python/gump/guru/xref.py
Index: xref.py
===
RCS file: /home/cvs/gump/python/gump/guru/xref.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xref.py 8 Jul 2004 20:33:10 - 1.3
+++ xref.py 19 Jul 2004 19:57:57 - 1.4
@@ -25,7 +25,6 @@
from gump.core.config import *
from gump.model.project import Project
from gump.model.state import *
-from gump.utils.domutils import *
class XRefGuru:
Know it all ...
@@ -66,26 +65,23 @@
def mapPackages(self):
for module in self.workspace.getModules():
for project in module.getProjects():
-if project.isPackaged(): continue
-for pdom in project.getDomChildIterator('package'):
-packageName=getDomTextValue(pdom)
+if project.hasPackageNames():
+for packageName in project.getPackageNames():
+if not self.packageToModule.has_key(packageName):
+self.packageToModule[packageName]=[]
-if not self.packageToModule.has_key(packageName):
-self.packageToModule[packageName]=[]
-
-if not self.packageToProject.has_key(packageName):
-self.packageToProject[packageName]=[]
+if not self.packageToProject.has_key(packageName):
+self.packageToProject[packageName]=[]
-# Store
-if not module in self.packageToModule[packageName]:
-self.packageToModule[packageName].append(module)
+# Store
+if not module in self.packageToModule[packageName]:
+self.packageToModule[packageName].append(module)
-if not project in self.packageToProject[packageName]:
-self.packageToProject[packageName].append(project)
+if not project in self.packageToProject[packageName]:
+self.packageToProject[packageName].append(project)
def mapDescriptions(self):
for module in self.workspace.getModules():
-if module.isPackaged(): continue
moduleDescription=module.getDescription()
if moduleDescription:
@@ -96,7 +92,6 @@
self.descriptionToModule[moduleDescription].append(module)
for project in module.getProjects():
-if project.isPackaged(): continue
projectDescription=project.getDescription
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 junitreport/ 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?
+
+if self.dir: return True
+return False
+
+def getDirectory(self):
+
+Get the directory.
+
+return self.dir
+
# represents a mkdir
cvs commit: gump/python/gump/run - New directory
ajack 2004/07/16 08:07:03 gump/python/gump/run - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project smartfrog.xml
ajack 2004/07/15 05:54:20 Modified:project smartfrog.xml Log: 1) Fixed notify address (removed the . from end) 2) Added ant.home Revision ChangesPath 1.19 +13 -8 gump/project/smartfrog.xml Index: smartfrog.xml === RCS file: /home/cvs/gump/project/smartfrog.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- smartfrog.xml 6 May 2004 16:03:40 - 1.18 +++ smartfrog.xml 15 Jul 2004 12:54:20 - 1.19 @@ -29,8 +29,9 @@ packageorg.smartfrog/package mkdir dir=smartfrog/build/ -ant basedir=. target=dist / -!-- ant basedir=smartfrog target=dist / -- +ant basedir=. target=dist + property name=ant.home reference=home project=ant/ + /ant depend project=ant runtime=false/ depend project=junit runtime=true/ depend project=javacc runtime=false/ @@ -44,7 +45,7 @@ license name=smartfrog/LICENSE.txt/ !-- javadoc nested=doc/javadocs/ -- nag from=Smartfrog lt;[EMAIL PROTECTED]gt; -to=[EMAIL PROTECTED] +to=[EMAIL PROTECTED] regexp subject=[Gump:Smartfrog] Build Failure/ /nag @@ -53,7 +54,9 @@ !-- ant tasks -- project name=smartfrog-tasks packageorg.smartfrog.tools.ant/package -ant basedir=extras/ant target=dist / +ant basedir=extras/ant target=dist + property name=ant.home reference=home project=ant/ + /ant depend project=ant runtime=true/ depend project=junit runtime=true/ depend project=smartfrog runtime=true/ @@ -65,7 +68,7 @@ license name=smartfrog/LICENSE.txt/ !-- javadoc nested=doc/javadocs/ -- nag from=Smartfrog lt;[EMAIL PROTECTED]gt; -to=[EMAIL PROTECTED] +to=[EMAIL PROTECTED] regexp subject=[Gump:Smartfrog] Build Failure/ /nag /project @@ -74,6 +77,7 @@ project name=smartfrog-tasks-test packageorg.smartfrog.tools.ant/package ant basedir=extras/ant target=test + property name=ant.home reference=home project=ant/ property name=system.tests value=false / /ant depend project=ant runtime=true/ @@ -88,7 +92,7 @@ junitreport nested=extras/ant/build/test/reports/ nag from=Smartfrog lt;[EMAIL PROTECTED]gt; -to=[EMAIL PROTECTED] +to=[EMAIL PROTECTED] regexp subject=[Gump:Smartfrog] Build Failure/ /nag /project @@ -101,7 +105,8 @@ -- project name=smartfrog-test packageorg.smartfrog/package -ant basedir=testharness target=test +ant basedir=testharness target=test + property name=ant.home reference=home project=ant/ property name=system.tests value=false / /ant depend project=ant runtime=true/ @@ -115,7 +120,7 @@ junitreport nested=testharness/build/test/reports/ nag from=Smartfrog lt;[EMAIL PROTECTED]gt; -to=[EMAIL PROTECTED] +to=[EMAIL PROTECTED] regexp subject=[Gump:Smartfrog] Build Failure/ /nag /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/guru stats.py
ajack 2004/07/15 09:20:24 Modified:python/gump/guru stats.py Log: Python import is a wierd beast. X imports Y, Z imports X, X gets Y. Darn annoying when you clean-up X 'cos it doesn't use Y, but Z does... Revision ChangesPath 1.4 +1 -1 gump/python/gump/guru/stats.py Index: stats.py === RCS file: /home/cvs/gump/python/gump/guru/stats.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stats.py 8 Jul 2004 20:33:10 - 1.3 +++ stats.py 15 Jul 2004 16:20:24 - 1.4 @@ -28,10 +28,10 @@ from gump.model.repository import Repository, RepositoryStatistics from gump.model.workspace import Workspace, WorkspaceStatistics from gump.model.state import * +from gump.utils import createOrderedList from gump.shared.comparator import * - class WorkspaceStatisticsGuru: Know it all for a workspace... def __init__(self, workspace): - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/notify notification.py
ajack 2004/07/14 09:29:30 Modified:python/gump/notify notification.py Log: Hmm, not sure how long this bug has been here... Revision ChangesPath 1.4 +2 -0 gump/python/gump/notify/notification.py Index: notification.py === RCS file: /home/cvs/gump/python/gump/notify/notification.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- notification.py 13 Jul 2004 18:44:35 - 1.3 +++ notification.py 14 Jul 2004 16:29:30 - 1.4 @@ -38,6 +38,8 @@ from gump.model.state import * from gump.utils.smtp import * from gump.utils import * +from gump.utils.work import * +from gump.utils.note import * LINE ='-- -- -- -- -- -- -- -- -- -- -- -- G U M P' SEPARATOR='*** G U M P' - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/model module.py repository.py
ajack 2004/07/14 11:12:12
Modified:python/gump/model module.py repository.py
Log:
redistributable is an element, not an attribute.
Revision ChangesPath
1.47 +1 -1 gump/python/gump/model/module.py
Index: module.py
===
RCS file: /home/cvs/gump/python/gump/model/module.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- module.py 8 Jul 2004 20:33:07 - 1.46
+++ module.py 14 Jul 2004 18:12:12 - 1.47
@@ -470,7 +470,7 @@
def isRedistributable(self):
# Existence means 'true'
-return self.hasDomAttribute('redistributable') \
+return self.hasDomChild('redistributable') \
or (self.repository and self.repository.isRedistributable())
#
1.14 +1 -2 gump/python/gump/model/repository.py
Index: repository.py
===
RCS file: /home/cvs/gump/python/gump/model/repository.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- repository.py 14 Jul 2004 15:48:01 - 1.13
+++ repository.py 14 Jul 2004 18:12:12 - 1.14
@@ -106,8 +106,7 @@
def isRedistributable(self):
# Existence means 'true'
-return self.hasDomAttribute('redistributable')
-
+return self.hasDomChild('redistributable')
def hasUser(self): return hasattr(self,'user')
def hasPassword(self): return hasattr(self,'password')
-
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/14 12:26:46
Modified:python/gump/document/xdocs documenter.py
Log:
Jars is old name, new is Artifacts.
Revision ChangesPath
1.18 +4 -6 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- documenter.py 14 Jul 2004 15:47:59 - 1.17
+++ documenter.py 14 Jul 2004 19:26:46 - 1.18
@@ -1622,13 +1622,11 @@
repoList.createEntry( SVN Directory: , module.svn.getDir())
repoList.createEntry( SVN URL: , module.svn.getRootUrl())
+if module.hasArtifacts():
+if module.jars.hasUrl():
+repoList.createEntry( Jars URL: , module.jars.getUrl())
-repoList.createEntry('Redistributable: ', `module.isRedistributable()`)
-
-if module.isRedistributable():
-if module.hasJars():
-if module.jars.hasUrl():
-repoList.createEntry( Jars URL: ,
module.jars.getUrl())
+repoList.createEntry('Redistributable: ', `module.isRedistributable()`)
# x.write('pstrongModule Config :/strong link
href=\'xml.html\'XML/link/p')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/repository publisher.py
ajack 2004/07/14 12:49:35 Modified:python/gump/repository publisher.py Log: A line of Python not touched is a time bomb... Needed to import 'log'. Revision ChangesPath 1.4 +2 -0 gump/python/gump/repository/publisher.py Index: publisher.py === RCS file: /home/cvs/gump/python/gump/repository/publisher.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- publisher.py 14 Jul 2004 15:47:56 - 1.3 +++ publisher.py 14 Jul 2004 19:49:35 - 1.4 @@ -21,6 +21,8 @@ import os +from gump import log + import gump.core.gumprun import gump.core.actor - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/repository publisher.py
ajack 2004/07/14 12:54:46 Modified:python/gump/repository publisher.py Log: Every one.. :( Revision ChangesPath 1.5 +2 -0 gump/python/gump/repository/publisher.py Index: publisher.py === RCS file: /home/cvs/gump/python/gump/repository/publisher.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- publisher.py 14 Jul 2004 19:49:35 - 1.4 +++ publisher.py 14 Jul 2004 19:54:46 - 1.5 @@ -26,6 +26,8 @@ import gump.core.gumprun import gump.core.actor +from gump.utils.tools import listDirectoryToFileHolder + class RepositoryPublisher(gump.core.actor.AbstractRunActor): def __init__(self,run): - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/process - New directory
ajack 2004/07/14 13:44:01 gump/python/gump/process - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/syndication atom.py
ajack 2004/07/14 13:47:03
Modified:python/gump/utils sync.py work.py tools.py
python/gump/core gumprun.py config.py gumpenv.py options.py
python/gump/model workspace.py state.py profile.py
python/gump/update cvs.py svn.py artifact.py
python/gump/test timing.py utils.py pyunit.py model.py
python/gump/document/xdocs documenter.py
python/gump/integration depot.py
python/gump/build abstract.py
python/gump/syndication atom.py
Added: python/gump/process __init__.py command.py .cvsignore
launcher.py
python/gump/test launching.py
Removed: python/gump/utils launcher.py
Log:
1) Serious re-work on launching (in hope that is it multi-threaded)
2) More cleanup of from X import *
3) Publisher stuff (to Repo).
Revision ChangesPath
1.20 +0 -1 gump/python/gump/utils/sync.py
Index: sync.py
===
RCS file: /home/cvs/gump/python/gump/utils/sync.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sync.py 8 Jul 2004 20:33:06 - 1.19
+++ sync.py 14 Jul 2004 20:47:01 - 1.20
@@ -27,7 +27,6 @@
from gump import log
from gump.utils.work import *
from gump.utils.file import *
-from gump.utils.launcher import *
from gump.utils.note import *
SYNC_ACTION=1
1.17 +13 -3 gump/python/gump/utils/work.py
Index: work.py
===
RCS file: /home/cvs/gump/python/gump/utils/work.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- work.py 8 Jul 2004 20:33:06 - 1.16
+++ work.py 14 Jul 2004 20:47:01 - 1.17
@@ -23,10 +23,11 @@
from gump.model.state import *
from gump.utils.owner import *
-from gump.utils.launcher import *
from gump.utils.timing import *
from gump.utils import *
+import gump.process.command
+import gump.process.launcher
WORK_TYPE_CHECK=1
WORK_TYPE_CONFIG=2
@@ -120,11 +121,20 @@
self.timerange.getStartTime(),
self.timerange.getEndTime(),
self.message)
-
+
+
+CW_STATE_MAP = { gump.process.command.CMD_STATE_NOT_YET_RUN : STATE_UNSET,
+ gump.process.command.CMD_STATE_SUCCESS : STATE_SUCCESS,
+ gump.process.command.CMD_STATE_FAILED : STATE_FAILED,
+ gump.process.command.CMD_STATE_TIMED_OUT : STATE_FAILED }
+
+def commandStateToWorkState(state):
+return CW_STATE_MAP[state]
+
class CommandWorkItem(TimedWorkItem):
Unit of Work
def __init__(self,type,command,result=None,message=''):
-if not result: result=CmdResult(command)
+if not result: result=gump.process.command.CmdResult(command)
TimedWorkItem.__init__(self,command.name,type,\
commandStateToWorkState(result.state), \
result.getStartSecs(), \
1.26 +4 -3 gump/python/gump/utils/tools.py
Index: tools.py
===
RCS file: /home/cvs/gump/python/gump/utils/tools.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- tools.py 15 May 2004 18:02:31 - 1.25
+++ tools.py 14 Jul 2004 20:47:01 - 1.26
@@ -27,7 +27,8 @@
from gump.utils.work import *
from gump.utils.file import *
from gump.utils.sync import *
-from gump.utils.launcher import *
+from gump.process.command import *
+from gump.process.launcher import *
def listDirectoryAsWork(workable,directory,name=None):
ok=0
@@ -35,7 +36,7 @@
cmd=getCmdFromString(ls -l +directory,name)
try:
result=execute(cmd)
-ok=result.state==CMD_STATE_SUCCESS
+ok=result.state==gump.process.command.CMD_STATE_SUCCESS
if not ok:
log.error('Failed to list [' + directory + ']')
except Exception, details:
@@ -77,7 +78,7 @@
cmd=getCmdFromString('cat '+str(file),'display_file_'+name)
try:
result=execute(cmd)
-ok=result.state==CMD_STATE_SUCCESS
+ok=result.isOk()
if not ok:
log.error('Failed to cat [' + str(file) + ']')
except Exception, details:
1.14 +2 -2 gump/python/gump/core/gumprun.py
Index: gumprun.py
===
RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
cvs commit: gump/python/gump/syndication atom.py
ajack 2004/07/14 13:50:23
Modified:python/gump/syndication atom.py
Log:
Cleaning up includes has risks...
Revision ChangesPath
1.20 +1 -1 gump/python/gump/syndication/atom.py
Index: atom.py
===
RCS file: /home/cvs/gump/python/gump/syndication/atom.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- atom.py 14 Jul 2004 20:47:02 - 1.19
+++ atom.py 14 Jul 2004 20:50:23 - 1.20
@@ -114,7 +114,7 @@
log.debug(Atom News Feed to : + self.file);
stream = open(self.file,'w')
-modified=time.strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())
+modified=time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
self.serializeToStream(stream,modified)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/repository publisher.py
ajack 2004/07/14 13:57:16 Modified:python/gump/repository publisher.py Log: Teach it where the repo is... Revision ChangesPath 1.6 +2 -0 gump/python/gump/repository/publisher.py Index: publisher.py === RCS file: /home/cvs/gump/python/gump/repository/publisher.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- publisher.py 14 Jul 2004 19:54:46 - 1.5 +++ publisher.py 14 Jul 2004 20:57:16 - 1.6 @@ -36,6 +36,8 @@ gump.core.actor.AbstractRunActor.__init__(self,run) +self.repository=run.getOutputsRepository() + def processProject(self,project): - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/utils domutils.py
ajack 2004/07/14 14:15:54
Modified:python/gump/utils domutils.py
Log:
Debugging attribute type mismatch...
Revision ChangesPath
1.3 +19 -14gump/python/gump/utils/domutils.py
Index: domutils.py
===
RCS file: /home/cvs/gump/python/gump/utils/domutils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- domutils.py 8 Jul 2004 20:33:06 - 1.2
+++ domutils.py 14 Jul 2004 21:15:54 - 1.3
@@ -93,22 +93,27 @@
if hasattr(target,attrName):
# Determine the type
attrType=type(getattr(target,attrName))
-
-if attrType is bool:
-if 'true' == value:
-value=True
+
+try:
+if attrType is bool:
+if 'true' == value:
+value=True
+else:
+value=False
+elif attrType is int:
+value=int(value)
+elif attrType is str or attrType is unicode:
+pass
else:
-value=False
-elif attrType is int:
-value=int(value)
-elif attrType is str or attrType is unicode:
-pass
-else:
-log.warn('Unknown Type %s for Attribute %s' % (attrType, attrName))
+log.warn('Unknown Type %s for Attribute %s' % (attrType, attrName))
+
-#print 'Transfer ', attrName, ' - ', value, ' [', attrType, ']'
-setattr(target,attrName,value)
-set+=1
+#print 'Transfer ', attrName, ' - ', value, ' [', attrType, ']'
+setattr(target,attrName,value)
+set+=1
+except:
+log.warn('Error with Type %s for Attribute %s' % (attrType, attrName))
+raise
return set
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/process launcher.py
ajack 2004/07/14 14:25:06 Modified:python/gump/process launcher.py Log: More haste, less speed. Revision ChangesPath 1.3 +1 -1 gump/python/gump/process/launcher.py Index: launcher.py === RCS file: /home/cvs/gump/python/gump/process/launcher.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- launcher.py 14 Jul 2004 21:12:04 - 1.2 +++ launcher.py 14 Jul 2004 21:25:06 - 1.3 @@ -183,7 +183,7 @@ # Write ENV over-writes... for envKey in execInfo.iterkeys(): -if not envKen in ['CMD','TMP','CWD']: +if not envKey in ['CMD','TMP','CWD']: os.environ[envKey]=execInfo[envKey] systemReturn=os.system(cmd) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/project dom4j.xml
ajack 2004/07/14 14:39:55 Modified:project dom4j.xml Log: Maarten needed api plus ri, so I removed the ids= Revision ChangesPath 1.43 +1 -1 gump/project/dom4j.xml Index: dom4j.xml === RCS file: /home/cvs/gump/project/dom4j.xml,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- dom4j.xml 24 Jun 2004 12:26:08 - 1.42 +++ dom4j.xml 14 Jul 2004 21:39:55 - 1.43 @@ -41,7 +41,7 @@ depend project=jaxen-from-packaged-dom4j/ depend project=xsdlib/ depend project=relaxng/ -depend project=stax ids=api/ +depend project=stax/ depend project=jtidy/ depend project=junitperf/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/stats statsdb.py
ajack 2004/07/13 14:43:32
Modified:python/gump/document/xdocs documenter.py
python/gump/stats statsdb.py
Log:
Docs tweaks (less is more).
Revision ChangesPath
1.15 +46 -35gump/python/gump/document/xdocs/documenter.py
Index: documenter.py
===
RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- documenter.py 13 Jul 2004 18:44:36 - 1.14
+++ documenter.py 13 Jul 2004 21:43:31 - 1.15
@@ -607,6 +607,7 @@
detailsTable.createEntry(Prefix: , self.workspace.prefix)
detailsTable.createEntry(Signature: , self.workspace.signature)
+self.documentStats(document,self.workspace)
self.documentProperties(detailsSection, self.workspace, 'Workspace
Properties')
# Does this self.workspace send notification (nag) mails?
@@ -1576,6 +1577,7 @@
if not pcount: pallTable.createLine('None')
+self.documentStats(document,module,realTime)
self.documentFileList(document,module,'Module-level Files')
self.documentWorkList(document,module,'Module-level Work')
@@ -1751,41 +1753,7 @@
if metadataLocation and metadataUrl:
detailsList.createEntry('Gump Metadata: ').createFork(metadataUrl,
metadataLocation)
-# Note: Leverages previous extraction from project statistics DB
-stats=project.getStats()
-
-statsSection=document.createSection('Statistics')
-
-#
-# Start annotating with issues...
-#
-if project.isNotOk() and stats.sequenceInState = SIGNIFICANT_DURATION:
-statsSection.createWarning( \
-'This project has existed in this failed state for a significant
duration.')
-
-statsTable=statsSection.createTable()
-
-if (not realTime) and self.config.isXdocs():
-# Generate an SVG for FOG:
-(file,title) = self.diagramFOG(project)
-if file:
-statsTable.createEntry(FOG Factor:
).createData().createIcon(file,title)
-
-statsTable.createEntry(FOG Factor: , '%02.2f' % stats.getFOGFactor())
-statsTable.createEntry('Dependency Depth: ', project.getDependencyDepth())
-statsTable.createEntry('Total Dependency Depth: ',
project.getTotalDependencyDepth())
-statsTable.createEntry(Successes: , stats.successes)
-statsTable.createEntry(Failures: , stats.failures)
-statsTable.createEntry(Prerequisite Failures: , stats.prereqs)
-statsTable.createEntry(Current State: ,
stateDescription(stats.currentState))
-statsTable.createEntry(Duration in state: , stats.sequenceInState)
-statsTable.createEntry(Start of state: ,
secsToDateTime(stats.startOfState))
-statsTable.createEntry(Previous State: ,
stateDescription(stats.previousState))
-
-if stats.first:
-statsTable.createEntry(First Success: , secsToDateTime(stats.first))
-if stats.last:
-statsTable.createEntry(Last Success: , secsToDateTime(stats.last))
+self.documentStats(document,project,realTime)
self.documentFileList(document,project,'Project-level Files')
@@ -1934,6 +1902,49 @@
#footerXDoc(x)
#endXDoc(x)
+def documentStats(self,node,entity,realTime=False):
+
+# Note: Leverages previous extraction from project statistics DB
+stats=entity.getStats()
+
+statsSection=node.createSection('Statistics')
+
+# Start annotating with issues...
+if entity.isNotOk() and stats.sequenceInState = SIGNIFICANT_DURATION:
+statsSection.createWarning(\
+'This entity has existed in this failed state for a significant
duration.')
+
+statsTable=statsSection.createTable()
+
+if not isinstance(entity,Workspace):
+if (not realTime) and self.config.isXdocs():
+# Generate an SVG for FOG:
+(file,title) = self.diagramFOG(entity)
+if file:
+statsTable.createEntry(FOG Factor:
).createData().createIcon(file,title)
+
+statsTable.createEntry(FOG Factor: , '%02.2f' % stats.getFOGFactor())
+
+if isinstance(entity,Project):
+statsTable.createEntry('Dependency Depth: ',
entity.getDependencyDepth
cvs commit: gump/python/gump/document/xdocs xdoc.py documenter.py
ajack 2004/07/13 16:01:31
Modified:python/gump/document/xdocs xdoc.py documenter.py
Log:
Too terse...
Revision ChangesPath
1.7 +6 -6 gump/python/gump/document/xdocs/xdoc.py
Index: xdoc.py
===
RCS file: /home/cvs/gump/python/gump/document/xdocs/xdoc.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdoc.py 13 Jul 2004 18:44:36 - 1.6
+++ xdoc.py 13 Jul 2004 23:01:31 - 1.7
@@ -534,13 +534,13 @@
def start(self):
if self.config.isXhtml():
-self.context.writeLineIndented('tabletrtd class=NOTE')
+self.context.writeLineIndented('ptabletrtd class=NOTE')
else:
self.context.writeLineIndented('note')
def end(self):
if self.config.isXhtml():
-self.context.writeLine('/td/tr/table')
+self.context.writeLine('/td/tr/table/p')
else:
self.context.writeLine('/note')
@@ -570,13 +570,13 @@
def start(self):
if self.config.isXhtml():
-self.context.writeLineIndented('tabletrtd class=WARN')
+self.context.writeLineIndented('ptabletrtd class=WARN')
else:
self.context.writeLineIndented('warning')
def end(self):
if self.config.isXhtml():
-self.context.writeLine('/td/tr/table')
+self.context.writeLine('/td/tr/table/p')
else:
self.context.writeLine('/warning')
@@ -601,13 +601,13 @@
def start(self):
if self.config.isXhtml():
-self.context.writeIndented('pre clas=CODE')
+self.context.writeIndented('ppre clas=CODE')
else:
self.context.writeIndented('source')
def end(self):
if self.config.isXhtml():
-self.context.writeIndented('/pre')
+self.context.writeIndented('/pre/p')
else:
self.context.writeIndented('/source')
1.16 +7 -7 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- documenter.py 13 Jul 2004 21:43:31 - 1.15
+++ documenter.py 13 Jul 2004 23:01:31 - 1.16
@@ -777,8 +777,8 @@
It started at %s. As of this moment (%s), %s modules have been updated,
and %s projects built. \
% (self.workspace.getStartDateTime(), time.strftime('%H:%M:%S'),
modules, projects ))
-document.createNote(Only projects with significant information
-(e.g a recent change of state, a failure, etc.) are listed at
runtime.)
+#document.createNote(Only projects with significant information
+#(e.g a recent change of state, a failure, etc.) are listed at
runtime.)
else:
document.createNote(This Gump run is complete.
@@ -839,11 +839,11 @@
pcount=0
for project in self.gumpSet.getCompletedProjects():
-if realTime and \
-(project.getState()==STATE_FAILED or \
-((project.getState()STATE_PREREQ_FAILED) and \
- (project.getStats().sequenceInState
INSIGNIFICANT_DURATION))):
-continue
+#if realTime and \
+#(project.getState()==STATE_FAILED or \
+#((project.getState()STATE_PREREQ_FAILED) and \
+# (project.getStats().sequenceInState
INSIGNIFICANT_DURATION))):
+#continue
pcount+=1
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/build builder.py
ajack 2004/07/12 08:18:04
Modified:python/gump/model project.py
python/gump/notify logic.py notifier.py
python/gump/core commandLine.py gumprun.py
python/gump/update updater.py
python/gump/build builder.py
Log:
Halved the work done after a module update or project build (the events were being
dispatched twice!)
Worked on notification (the two e-mails were a tipoff to above).
Revision ChangesPath
1.87 +1 -2 gump/python/gump/model/project.py
Index: project.py
===
RCS file: /home/cvs/gump/python/gump/model/project.py,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- project.py8 Jul 2004 20:33:07 - 1.86
+++ project.py12 Jul 2004 15:18:04 - 1.87
@@ -434,10 +434,9 @@
fromaddr=getDomAttributeValue(notifyEntry,'from',workspace.email)
self.notifys.append(
AddressPair(
-getStringFromUnicode(toaddr),\
+getStringFromUnicode(toaddr),
getStringFromUnicode(fromaddr)))
-
# Build Dependencies Map [including depends from
ant|maven/property/depend
if not packaged:
(badDepends, badOptions) = self.importDependencies(workspace)
1.4 +7 -4 gump/python/gump/notify/logic.py
Index: logic.py
===
RCS file: /home/cvs/gump/python/gump/notify/logic.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- logic.py 8 Jul 2004 20:33:06 - 1.3
+++ logic.py 12 Jul 2004 15:18:04 - 1.4
@@ -66,10 +66,13 @@
if not STATE_PREREQ_FAILED == stats.previousState:
if stats.getTotalRuns() 1:
notification=PositiveNotification(self.run,entity)
-else:
-if self.run.getOptions().isOfficial() \
-and entity.containsNasties():
-notification=NegativeNotification(self.run,entity,'Contains
warning/error annotations.')
+# :TODO:
+# 1) Too verbose
+# 2) Need a warning type w/o the 'outstanding ...'
+# else:
+#if self.run.getOptions().isOfficial() \
+#and entity.containsNasties():
+#notification=NegativeNotification(self.run,entity,' contains
warning/error annotations')
#elif entity.isPrereqFailed():
#if (stats.sequenceInState == 1):
1.7 +5 -5 gump/python/gump/notify/notifier.py
Index: notifier.py
===
RCS file: /home/cvs/gump/python/gump/notify/notifier.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- notifier.py 8 Jul 2004 20:33:06 - 1.6
+++ notifier.py 12 Jul 2004 15:18:04 - 1.7
@@ -206,11 +206,11 @@
if self.unsent: return 1
return 0
-
def notifyWorkspace(self,notification):
Notify for the workspace
content=notification.resolveContent(self.resolver, self.id)
+self.id+=1
subject=self.workspace.prefix+': Gump Workspace ' + self.workspace.getName()
@@ -223,6 +223,7 @@
# Form the content...
content=notification.resolveContent(self.resolver, self.id)
+self.id+=1
# Form the subject
subject=self.workspace.prefix+ \
@@ -240,6 +241,7 @@
# Form the content...
#
content=notification.resolveContent(self.resolver, self.id)
+self.id+=1
# Form the subject
subject=self.workspace.prefix+': ' \
@@ -295,10 +297,8 @@
sent=False
try:
-log.info('Send Notify e-mail (#' + `self.id` + ') :\n To: ' +
str(toaddr) + \
-'\n From: ' + str(fromaddr) + \
-'\n Subject: ' + str(subject))
-self.id+=1
+log.info('Send Notify To: ' + str(toaddr) +
+' From: ' + str(fromaddr) + ' Subject: ' + str(subject))
# Form the user visable part ...
email=EmailMessage( toaddrs,
1.11 +13 -14gump/python/gump/core/commandLine.py
Index: commandLine.py
===
RCS file: /home/cvs/gump/python/gump/core/commandLine.py,v
retrieving revision 1.10
cvs commit: gump/python/gump/core config.py
ajack 2004/07/12 08:54:17
Modified:python/gump/runner demand.py
python/gump/notify notifier.py
python/gump/core config.py
Log:
Code cleanup. Updated version to 0002 (so can see when sites have been updated).
Revision ChangesPath
1.5 +17 -4 gump/python/gump/runner/demand.py
Index: demand.py
===
RCS file: /home/cvs/gump/python/gump/runner/demand.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- demand.py 8 Jul 2004 20:33:11 - 1.4
+++ demand.py 12 Jul 2004 15:54:17 - 1.5
@@ -106,6 +106,20 @@
module.setUpdated(True)
finally:
lock.release()
+
+def performBuild(self,project):
+
+Perform a project build
+
+
+# Perform the build action
+self.builder.buildProject(project)
+
+# Generate the build event
+self.run.generateEvent(project)
+
+# Mark completed
+gumpSet.setCompletedProject(project)
###
@@ -132,10 +146,8 @@
log.debug('Update module *inlined* ' + `module` + '.')
self.performUpdate(module)
-# Process
-self.builder.buildProject(project)
-self.run.generateEvent(project)
-gumpSet.setCompletedProject(project)
+# Process the project
+self.performBuild(project)
# Seems a nice place to peek/clean-up...
#printTopRefs(100,'Before Loop GC')
@@ -144,6 +156,7 @@
#invokeGarbageCollection(self.__class__.__name__)
#printTopRefs(100,'After GC')
+# Kinda pointless given above
if workspace.isMultithreading() and workspace.hasUpdaters():
self.waitForThreads()
1.8 +7 -6 gump/python/gump/notify/notifier.py
Index: notifier.py
===
RCS file: /home/cvs/gump/python/gump/notify/notifier.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- notifier.py 12 Jul 2004 15:18:04 - 1.7
+++ notifier.py 12 Jul 2004 15:54:17 - 1.8
@@ -166,6 +166,10 @@
self.unsentSubjects += subject + '\n'
self.unsents += 1
+def getNextIdentifier(self):
+self.id += 1
+return self.id
+
def getUnwantedContent(self):
return
self.getBatchContent(self.unwanteds,self.unwantedSubjects,self.unwanted)
@@ -209,8 +213,7 @@
def notifyWorkspace(self,notification):
Notify for the workspace
-content=notification.resolveContent(self.resolver, self.id)
-self.id+=1
+content=notification.resolveContent(self.resolver, self.getNextIdentifier())
subject=self.workspace.prefix+': Gump Workspace ' + self.workspace.getName()
@@ -222,8 +225,7 @@
Notify to a specific module's notify entry
# Form the content...
-content=notification.resolveContent(self.resolver, self.id)
-self.id+=1
+content=notification.resolveContent(self.resolver, self.getNextIdentifier())
# Form the subject
subject=self.workspace.prefix+ \
@@ -240,8 +242,7 @@
#
# Form the content...
#
-content=notification.resolveContent(self.resolver, self.id)
-self.id+=1
+content=notification.resolveContent(self.resolver, self.getNextIdentifier())
# Form the subject
subject=self.workspace.prefix+': ' \
1.7 +1 -1 gump/python/gump/core/config.py
Index: config.py
===
RCS file: /home/cvs/gump/python/gump/core/config.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.py 8 Jul 2004 20:33:09 - 1.6
+++ config.py 12 Jul 2004 15:54:17 - 1.7
@@ -88,7 +88,7 @@
class setting:
Configuration of hardcoded settings
-version='2.1.0-alpha-0001'
+version='2.1.0-alpha-0002'
ws_version=0.4
ws_minimum_version=0.3
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/runner demand.py
ajack 2004/07/12 09:07:41 Modified:python/gump/runner demand.py Log: Pressed COMMIT before the unit test finished... Revision ChangesPath 1.6 +1 -1 gump/python/gump/runner/demand.py Index: demand.py === RCS file: /home/cvs/gump/python/gump/runner/demand.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- demand.py 12 Jul 2004 15:54:17 - 1.5 +++ demand.py 12 Jul 2004 16:07:41 - 1.6 @@ -119,7 +119,7 @@ self.run.generateEvent(project) # Mark completed -gumpSet.setCompletedProject(project) +self.run.getGumpSet().setCompletedProject(project) ### - 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/12 11:19:05
Modified:python/gump/runner runner.py
python/gump/document/xdocs documenter.py
Log:
Some work on command line (human) running of Gump.
Revision ChangesPath
1.7 +4 -2 gump/python/gump/runner/runner.py
Index: runner.py
===
RCS file: /home/cvs/gump/python/gump/runner/runner.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- runner.py 8 Jul 2004 20:33:11 - 1.6
+++ runner.py 12 Jul 2004 18:19:05 - 1.7
@@ -112,7 +112,8 @@
self.run.registerActor(Statistician(self.run))
# Generate results
-self.run.registerActor(Resulter(self.run))
+if self.run.getOptions().isResults():
+self.run.registerActor(Resulter(self.run))
# Document..
# Use XDOCS if not overridden...
@@ -128,7 +129,8 @@
self.run.registerActor(documenter)
# Syndicate once documented
-self.run.registerActor(Syndicator(self.run))
+if self.run.getOptions().isSyndicate():
+self.run.registerActor(Syndicator(self.run))
# Notify last
if self.run.getOptions().isNotify() and self.run.getWorkspace().isNotify():
1.13 +30 -19gump/python/gump/document/xdocs/documenter.py
Index: documenter.py
===
RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- documenter.py 8 Jul 2004 20:33:09 - 1.12
+++ documenter.py 12 Jul 2004 18:19:05 - 1.13
@@ -379,8 +379,7 @@
# Workspace Pieces
#
def documentRunDetails(self):
-
-
+
#
# --
#
@@ -396,21 +395,8 @@
definitionSection=document.createSection('Run Details')
if not self.gumpSet.isFull():
-notice=definitionSection.createWarning()
-
-notice.createText(This output does not represent the complete
workspace,
-but part of it.
-Only projects, and their dependents, matching this regular expression
)
-notice.createStrong(self.gumpSet.projectexpression)
-notice.createBreak()
-notice.createBreak()
-notice.createStrong('Requested Projects: ')
-notice.createBreak()
-notice.createBreak()
-for project in self.gumpSet.projects:
-notice.createText(project.name)
-notice.createText(' ')
-
+self.documentPartial(definitionSection)
+
definitionTable=definitionSection.createTable()
definitionTable.createEntry('Gump Run GUID', self.run.getRunGuid())
definitionTable.createEntry('Gump Run (Hex) GUID', self.run.getRunHexGuid())
@@ -453,6 +439,22 @@
document.serialize()
document=None
+def documentPartial(self,node):
+notice=node.createWarning()
+
+notice.createText(This output does not represent the complete
workspace,
+but part of it.
+Only projects, and their dependents, matching this regular expression
)
+notice.createStrong(self.gumpSet.projectexpression)
+notice.createBreak()
+notice.createBreak()
+notice.createStrong('Requested Projects: ')
+notice.createBreak()
+notice.createBreak()
+for project in self.gumpSet.projects:
+notice.createText(project.name)
+notice.createText(' ')
+
def documentEverythingElse(self):
self.documentRepositories()
@@ -767,15 +769,24 @@
spec.getRootPath())
if realTime:
+
+# Work done...
+modules = len(self.gumpSet.getCompletedModules())
+projects = len(self.gumpSet.getCompletedProjects())
+
document.createWarning(This Gump run is currently in progress.
-It started at %s.
-% self.workspace.getStartDateTime() )
+It started at %s. So far %s modules have been updated, and %s projects
built. \
+% (self.workspace.getStartDateTime(), modules, projects ))
+
else:
document.createNote(This Gump run is complete
cvs commit: gump/python/gump/runner demand.py runner.py
ajack 2004/07/12 11:24:27
Modified:python/gump/runner demand.py runner.py
Log:
More of the same...
Revision ChangesPath
1.7 +20 -10gump/python/gump/runner/demand.py
Index: demand.py
===
RCS file: /home/cvs/gump/python/gump/runner/demand.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demand.py 12 Jul 2004 16:07:41 - 1.6
+++ demand.py 12 Jul 2004 18:24:27 - 1.7
@@ -129,25 +129,35 @@
printTopRefs(100,'Before Loop')
+# The key information
gumpSet=self.run.getGumpSet()
-
+gumpOptions=self.run.getOptions()
workspace = self.run.getWorkspace()
-if workspace.isMultithreading() and workspace.hasUpdaters():
-# Experimental...
-self.spawnUpdateThreads(workspace.getUpdaters())
+if gumpOptions.isUpdate():
+if workspace.isMultithreading() and workspace.hasUpdaters():
+# Experimental...
+self.spawnUpdateThreads(workspace.getUpdaters())
+
+# The project TODO list...
+if gumpOptions.isQuick():
+sequence=gumpSet.getProjects()
+else:
+sequence=gumpSet.getProjectSequence()
# In order...
-for project in gumpSet.getProjectSequence():
+for project in sequence:
# Process the module, upon demand
module=project.getModule()
-if not module.isUpdated():
-log.debug('Update module *inlined* ' + `module` + '.')
-self.performUpdate(module)
+if gumpOptions.isUpdate():
+if not module.isUpdated():
+log.debug('Update module *inlined* ' + `module` + '.')
+self.performUpdate(module)
-# Process the project
-self.performBuild(project)
+if gumpOptions.isBuild():
+# Process the project
+self.performBuild(project)
# Seems a nice place to peek/clean-up...
#printTopRefs(100,'Before Loop GC')
1.8 +1 -1 gump/python/gump/runner/runner.py
Index: runner.py
===
RCS file: /home/cvs/gump/python/gump/runner/runner.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- runner.py 12 Jul 2004 18:19:05 - 1.7
+++ runner.py 12 Jul 2004 18:24:27 - 1.8
@@ -160,7 +160,7 @@
log.debug('Perform run using [' + `self` + ']')
-self.performRun()
+return self.performRun()
def getRunner(run):
from gump.runner.demand import OnDemandRunner
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/build builder.py
ajack 2004/07/09 11:20:36
Modified:python/gump/document/xdocs xdoc.py
python/gump/build builder.py
Log:
1) Attempt to use rmtree (to remove a full dir)
2) PythonPowered
Revision ChangesPath
1.4 +2 -2 gump/python/gump/document/xdocs/xdoc.py
Index: xdoc.py
===
RCS file: /home/cvs/gump/python/gump/document/xdocs/xdoc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xdoc.py 8 Jul 2004 20:33:09 - 1.3
+++ xdoc.py 9 Jul 2004 18:20:36 - 1.4
@@ -756,7 +756,7 @@
self.context.writeLine(' tda
href=%s/gump_stats/index.htmlStats/a/tdtd|/td' % self.rootpath)
self.context.writeLine(' tda
href=%s/gump_xref/index.htmlXRef/a/td' % self.rootpath)
-self.context.writeLine(' td colspan=3img align=right
src=%s/images/gump-logo.png alt=Logo//td' % self.rootpath)
+self.context.writeLine(' td colspan=3img align=right
src=%s/images/gump-logo.png alt=Gump Logo//td' % self.rootpath)
self.context.writeLine(' /tr')
self.context.writeLine('/table')
else:
@@ -779,7 +779,7 @@
self.context.writeLine('/document')
else:
from gump.core.config import default
-self.context.writeLine('p align=rightLast Updated: %s/p' %
default.datetime)
+self.context.writeLine('p align=rightLast Updated: %s.img
align=right src=%s/images/PythonPowered.gif alt=Python Logo//p' %
default.datetime)
self.context.writeLine('/html')
self.close()
1.6 +21 -1 gump/python/gump/build/builder.py
Index: builder.py
===
RCS file: /home/cvs/gump/python/gump/build/builder.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- builder.py8 Jul 2004 20:33:09 - 1.5
+++ builder.py9 Jul 2004 18:20:36 - 1.6
@@ -16,6 +16,18 @@
# limitations under the License.
+
+ This is the main project builder for gump.
+
+ 1) Pre build tasks (deleting directories/files, making directories)
+ are performed here.
+
+ 2) Leveraging ant and/or maven and/or script 'assistants' the
+ 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,
+ etc).
@@ -183,6 +195,13 @@
def performDelete(self,project,delete,index=0):
Return the delete command for a delete entry
+
+return
+
+# :TODO: Re-instate this some time, when can delete
+# non-empty directories.
+
+
basedir=os.path.abspath(project.getModule().getWorkingDirectory() or
dir.base)
#
@@ -191,7 +210,8 @@
if delete.hasDirectory():
dir=delete.getDirectory()
try:
-os.rmdir(dir)
+import shutil
+shutil.rmtree(dir)
project.addInfo('Deleted directory ['+dir+']')
except:
project.addError('Failed to delete directory ['+dir+']')
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: gump/python/gump/shared comparator.py
ajack 2004/07/08 13:33:11 Modified:python/gump update.py preview.py build.py env.py debug.py check.py integrate.py python/gump/notify notification.py notifier.py logic.py python/gump/utils http.py sync.py launcher.py note.py work.py __init__.py owner.py file.py python/gump/model project.py server.py profile.py module.py repository.py depend.py builder.py propagation.py object.py property.py __init__.py tracker.py workspace.py state.py python/gump/document documenter.py resolver.py python/gump/test updater.py resulting.py pyunit.py syndicator.py resolving.py __init__.py xref.py maven.py utils.py notifying.py model.py python/gump/test/resources/complete1 download1.xml profile.xml module3.xml python/gump/syndication atom.py abstract.py rss.py syndicator.py python/gump/test/resources/full1 profile.xml svn_repository1.xml workspace.xml download1.xml module3.xml python/gump/update svn.py cvs.py updater.py python/gump/document/xdocs __init__.py resolver.py documenter.py xdoc.py python/gump/stats statsdb.py statistician.py python/gump/document/text resolver.py documenter.py python/gump/results resulter.py model.py python/gump/core gumpenv.py gumpinit.py config.py gumprun.py commandLine.py actor.py python/gump/build ant.py maven.py abstract.py builder.py script.py python/gump/admin stats.py python/gump/guru stats.py xref.py src/documentation/content/xdocs/metadata maven.xml project.xml template/forrest/content/xdocs site.xml .gumpytest.sh gumpy.py gumpy.sh .cvsignore python .cvsignore python/gump/gui view.py python/gump/runner runner.py tasks.py demand.py python/gump/svg depdiag.py scale.py python/gump/shared comparator.py Added: python/gump/loader .cvsignore __init__.py loader.py template/xhtml/gump_icons failed.png unset.png no_work_performed.png success.png prerequisite_failed.png complete.png python/gump/utils tasks.py domutils.py smtp.py timing.py python/gump/threads __init__.py .cvsignore tools.py python/gump/model cp.py misc.py python/gump/test threads.py loading.py timing.py xdocs.py python/gump/test/resources/complete1 artifact_repository1.xml python/gump/integration .cvsignore depot.py __init__.py cvs.py python/gump/test/resources/full1 artifact_repository1.xml python/gump/update artifact.py python/gump/document/xdocs config.py python/gump/performance xdocs.py gurus.py __init__.py .cvsignore deps.py python/gump/repository artifact.py template/xhtml/images gump-logo.png PythonPowered.gif icon.png apache.png template/xhtml/css style.css template/xhtml favicon.ico python/tool profileResults.py .cvsignore __init__.py commitCheck.py Removed: python/gump logconf.ini server try.xml hermes.xml lsd.xml dotnot.xml python/gump/utils xmlutils.py python/storage/random/results model.py loader.py __init__.py resulter.py .cvsignore python/gump/model rawmodel.py loader.py python/gump/net __init__.py .cvsignore cvs.py smtp.py python/gump/test loader_tests.py xdoc_tests.py xml_tests.py gumpset_tests.py python/gump/test/resources/complete1 jars_repository1.xml python/gump/test/resources/full1 jars_repository1.xml python/gump/update jars.py python/gump/repository jars.py python/logging handlers.py __init__.py PKG-INFO .cvsignore config.py .commitCheck.py Log: Merged CleanUp branch in. Revision ChangesPath 1.2 +1 -0 gump/python/gump/loader/.cvsignore http://cvs.apache.org/viewcvs/gump/python/gump/loader/.cvsignore.diff?r1=1.1r2=1.2 1.2 +21 -0 gump/python/gump/loader/__init__.py http://cvs.apache.org/viewcvs/gump/python/gump/loader/__init__.py.diff?r1=1.1r2
cvs commit: gump/python/gump/model misc.py
ajack 2004/07/07 09:29:40
Modified:src/documentation/content/xdocs/metadata Tag: CleanUp
ant.xml
python/gump Tag: CleanUp env.py update.py debug.py build.py
integrate.py
python/gump/loader Tag: CleanUp loader.py
python/gump/core Tag: CleanUp actor.py config.py gumprun.py
python/gump/utils Tag: CleanUp http.py
python/gump/document/xdocs Tag: CleanUp xdoc.py
.Tag: CleanUp gumpy.sh
python/gump/model Tag: CleanUp misc.py
Log:
Try to fix caching. [retry, CVS woes]
Revision ChangesPath
No revision
No revision
1.5.4.2 +1 -1 gump/src/documentation/content/xdocs/metadata/ant.xml
Index: ant.xml
===
RCS file: /home/cvs/gump/src/documentation/content/xdocs/metadata/ant.xml,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- ant.xml 21 Jun 2004 04:06:10 - 1.5.4.1
+++ ant.xml 7 Jul 2004 16:29:39 - 1.5.4.2
@@ -48,7 +48,7 @@
td
The ant target to invoke. emThis can be a space separated list./em
/td
-tdNo Defaults to stronggump/strong./td
+tdNo (defaults to no target)./td
/tr
/table
No revision
No revision
1.1.4.1 +1 -1 gump/python/gump/env.py
Index: env.py
===
RCS file: /home/cvs/gump/python/gump/env.py,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- env.py26 Apr 2004 01:00:33 - 1.1
+++ env.py7 Jul 2004 16:29:39 - 1.1.4.1
@@ -41,7 +41,7 @@
#
result = 1
-GumpEnvironment().checkEnvironment(1)
+GumpEnvironment().checkEnvironment(True)
#
log.info('Gump Environment Check complete. Exit code:' + str(result))
1.29.2.5 +2 -2 gump/python/gump/update.py
Index: update.py
===
RCS file: /home/cvs/gump/python/gump/update.py,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -u -r1.29.2.4 -r1.29.2.5
--- update.py 16 Jun 2004 17:50:40 - 1.29.2.4
+++ update.py 7 Jul 2004 16:29:39 - 1.29.2.5
@@ -61,7 +61,7 @@
workspace=WorkspaceLoader(options.isCache()).load(ws)
# Ensure we use text, not xdocs...
-options.setText(1)
+options.setText(True)
#
options.setObjectives(OBJECTIVE_UPDATE)
1.6.2.5 +1 -1 gump/python/gump/debug.py
Index: debug.py
===
RCS file: /home/cvs/gump/python/gump/debug.py,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- debug.py 16 Jun 2004 17:50:40 - 1.6.2.4
+++ debug.py 7 Jul 2004 16:29:39 - 1.6.2.5
@@ -56,7 +56,7 @@
workspace=WorkspaceLoader(options.isCache()).load(ws)
# Ensure we use text, not xdocs...
-options.setText(1)
+options.setText(True)
#
options.setObjectives(OBJECTIVE_DEBUG)
1.48.2.5 +1 -1 gump/python/gump/build.py
Index: build.py
===
RCS file: /home/cvs/gump/python/gump/build.py,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.5
diff -u -r1.48.2.4 -r1.48.2.5
--- build.py 16 Jun 2004 17:50:40 - 1.48.2.4
+++ build.py 7 Jul 2004 16:29:39 - 1.48.2.5
@@ -52,7 +52,7 @@
workspace=WorkspaceLoader(options.isCache()).load(ws)
# Ensure we use text, not xdocs...
-options.setText(1)
+options.setText(True)
#
options.setObjectives(OBJECTIVE_BUILD)
1.28.2.4 +3 -3 gump/python/gump/integrate.py
Index: integrate.py
===
RCS file: /home/cvs/gump/python/gump/integrate.py,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.4
diff -u -r1.28.2.3 -r1.28.2.4
--- integrate.py 11 Jun 2004 20:46:10 - 1.28.2.3
+++ integrate.py 7 Jul 2004 16:29:39 - 1.28.2.4
@@ -66,8 +66,8 @@
logResourceUtilization('Before create run')
# Has to be absolute latest descriptors, not quick/cached...
-options.setQuick(0)
-options.setCache(0)
+options.setQuick(False)
+options.setCache(False)
#
options.setObjectives(OBJECTIVE_INTEGRATE)
No revision
No revision
1.1.2.10 +2 -2
