ajack 2003/10/17 16:13:26
Modified: profile gump.xml minimal-profile.xml
python/gump context.py launcher.py logic.py document.py
site/xdocs/stylesheets project.xml
project werkz.xml jaxen.xml
repository codehaus.xml
Added: site/xdocs gettingstarted.xml
Removed: project webmacro.xml
repository webmacro.xml
Log:
1) First stab at werkz, by correcting codehaus CVSROOT
2) Removed webmacro 'cos they asked me to
3) Yet another attempt at getting CLASSPATHs right.
4) Documenting 3 above.
Revision Changes Path
1.1 jakarta-gump/site/xdocs/gettingstarted.xml
Index: gettingstarted.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<author email="[EMAIL PROTECTED]">Adam R. B. Jack</author>
<title>Gump: Getting Started</title>
</properties>
<body>
<section name="Getting started with Gump">
<p>There are a number of ways to work with Gump, and
</p>
<table>
<tr><th>Interest</th><th>Why</th><th>Descriprion</th></tr>
<tr>
<td>What is Gump></td>
<td>Want Gump 101</td>
<td></td>
</tr>
<tr>
<td>Getting your project Gumped</td>
<td>Continuous integrate is powerful</td>
<td>This is a typical entry point, you know Gump is there, you want to
benefit from the service (but you don't have time to look
deeper into
Gump's internals)</td>
</tr>
<tr>
<td>Getting your own (custom) Gump</td>
<td>You want to Gump your private projects</td>
<td>This is becomming more and more popular, as Gump matures
to be more easily installable.</td>
</tr>
<tr>
<td>Developing Gump</td>
<td>You wish it did more</td>
<td>Gump is an awesome continuous integration build tool,
but in custom environments there are site specific additions
that might be nice, or there are core features it lacks.
Here is how to start.</td>
</tr>
</table>
<subsection name="gump101">
<p></p>
</subsection>
<subsection name="project">
<p>Submitting a new <a href="project.html">project</a> </p>
</subsection>
<subsection name="custom">
<p>You wish to install a local Gump</p>
</subsection>
<subsection name="developer">
<p></p>
</subsection>
</section>
</body>
</document>
1.269 +2 -4 jakarta-gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/profile/gump.xml,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- gump.xml 14 Oct 2003 05:58:00 -0000 1.268
+++ gump.xml 17 Oct 2003 23:13:26 -0000 1.269
@@ -160,7 +160,6 @@
<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spice/spice/module.xml?content-type=text/xml&rev=HEAD";
/>
<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/spice/spice/module.xml?rev=1.26.2.2&content-type=text/xml"/>
<module href="project/forehead.xml"/>
- <module href="project/werkz.xml"/>
<module
href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/ldapd/ldapd-common/gump.xml?rev=HEAD&content-type=text/xml"/>
<!-- module
href="http://cvs.werken.com/viewcvs.cgi/werkz/gump.xml?rev=HEAD&cvsroot=werkz"/ -->
@@ -204,7 +203,6 @@
<module href="project/town.xml"/>
<module href="project/uddi4j.xml"/>
<module href="project/village.xml"/>
- <module href="project/webmacro.xml"/>
<module href="project/wsdl4j.xml"/>
<module href="project/cos.xml"/>
<module href="project/multipartrequest.xml"/>
@@ -213,8 +211,9 @@
<!-- CodeHaus -->
+ <module href="project/werkz.xml"/>
<module
href="http://cvs.codehaus.org/viewcvs.cgi/*checkout*/jcontainer/module.xml?rev=1.1&root=jcontainer"/>
-
+
<!-- Sun -->
<!--module href="project/fesi.xml"/-->
@@ -301,7 +300,6 @@
<repository href="repository/mozilla.xml"/>
<repository href="repository/tigris.xml"/>
<repository href="repository/sourceforge.xml"/>
- <repository href="repository/webmacro.xml"/>
<repository href="repository/werken.xml"/>
<repository href="repository/whichever.xml"/>
<repository href="repository/ws.xml"/>
1.3 +0 -1 jakarta-gump/profile/minimal-profile.xml
Index: minimal-profile.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/profile/minimal-profile.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minimal-profile.xml 19 Feb 2003 13:05:56 -0000 1.2
+++ minimal-profile.xml 17 Oct 2003 23:13:26 -0000 1.3
@@ -54,7 +54,6 @@
<repository href="repository/mozilla.xml"/>
<repository href="repository/tigris.xml"/>
<repository href="repository/sourceforge.xml"/>
- <repository href="repository/webmacro.xml"/>
<repository href="repository/werken.xml"/>
<repository href="repository/whichever.xml"/>
<repository href="repository/xml.xml"/>
1.21 +1 -1 jakarta-gump/python/gump/context.py
Index: context.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/context.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- context.py 17 Oct 2003 20:57:15 -0000 1.20
+++ context.py 17 Oct 2003 23:13:26 -0000 1.21
@@ -201,7 +201,7 @@
overview=TimedWorkItem.overview(self)
overview += self.command.overview()
- if not workitem.status == STATUS_SUCCESS:
+ if not self.status == STATUS_SUCCESS:
overview+=self.result.tail(50)
return overview
1.17 +3 -1 jakarta-gump/python/gump/launcher.py
Index: launcher.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/launcher.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- launcher.py 17 Oct 2003 19:04:12 -0000 1.16
+++ launcher.py 17 Oct 2003 23:13:26 -0000 1.17
@@ -246,8 +246,10 @@
def tail(self,lines):
tail = "---------------------------------------------"
+
if self.output:
- tail += gump.tools.tailFileToString(self.output,lines)
+ from gump.tools import tailFileToString
+ tail += tailFileToString(self.output,lines)
else:
tail += "No output"
1.29 +48 -22 jakarta-gump/python/gump/logic.py
Index: logic.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- logic.py 17 Oct 2003 03:48:14 -0000 1.28
+++ logic.py 17 Oct 2003 23:13:26 -0000 1.29
@@ -318,9 +318,11 @@
#
class AnnotatedPath:
"""Contains a Path plus optional 'contributor' """
- def __init__(self,path,context=None):
+ def __init__(self,path,context=None,pcontext=None,note=None):
self.path=path
self.context=context
+ self.pcontext=pcontext
+ self.note=note
def __repr__(self):
return self.path
@@ -329,7 +331,8 @@
return self.path
def __eq__(self,other):
- return self.path == other.path and self.context == other.context
+ return self.path == other.path \
+ and self.context == other.context
def __cmp__(self,other):
cmp = self.path < other.path
@@ -345,7 +348,7 @@
# :TODO: Hack to avoid a crash, don't know why it is needed...
if project.jar[i].path:
jar=os.path.normpath(project.jar[i].path)
- outputs.append(AnnotatedPath(jar,pctxt))
+ outputs.append(AnnotatedPath(jar,pctxt,None,"Project output"))
return outputs
@@ -396,7 +399,7 @@
+ project.name + " in " + project.module)
if path:
- classpath.append(AnnotatedPath(path,pctxt))
+ classpath.append(AnnotatedPath(path,pctxt,None,'Working Directory'))
# Append dependent projects (including optional)
visited=[]
@@ -445,6 +448,10 @@
pctxt=context.getProjectContextForProject(project)
# The dependency drivers...
+ #
+ # runtime (i.e. this is a runtime dependency)
+ # inherit (i.e. inherit stuff from a dependency)
+ #
runtime=depend.runtime
inherit=depend.inherit
if depend.ids:
@@ -453,13 +460,26 @@
ids=None
#
+ # Explain..
+ #
+ dependStr=''
+ if inherit:
+ if dependStr: dependStr += ','
+ dependStr += 'Inherit='+str(inherit)
+ if runtime:
+ if dependStr: dependStr += ','
+ dependStr += ',Runtime'
+ if ids: dependStr += ', IDs [' + ' '.join(ids) + ']'
+
+ #
# Append JARS for this project
# (respect ids)
#
for jar in project.jar:
# If 'all' or in ids list:
if (not ids) or (jar.id in ids):
- path=AnnotatedPath(jar.path,pctxt)
+ if ids: dependStr += 'id = ' + jar.id
+ path=AnnotatedPath(jar.path,pctxt,parentctxt,dependStr)
if not path in classpath:
classpath.append(path)
@@ -469,22 +489,21 @@
#
# Deep copy all/hard (or those for runtime)
#
- if inherit == 'all' or inherit=='hard' or runtime:
- # Append sub-projects outputs
- if project.depend:
- for subdepend in project.depend:
- if not runtime or subdepend.runtime:
- for path in
getDependOutputList(project,pctxt,subdepend,context,visited):
- if not path in classpath:
- classpath.append(path)
-
- # Append optional sub-project's output (that may not exist)
- if project.option:
- for suboption in project.option:
- if not runtime or suboption.runtime:
- for path in
getDependOutputList(project,pctxt,suboption,context,visited):
- if not path in classpath:
- classpath.append(path)
+ # Append sub-projects outputs
+ if project.depend:
+ for subdepend in project.depend:
+ if subdepend.inherit or ( runtime and subdepend.runtime ):
+ for path in getDependOutputList(project,pctxt,subdepend,context,visited):
+ if not path in classpath:
+ classpath.append(path)
+
+ # Append optional sub-project's output (that may not exist)
+ if project.option:
+ for suboption in project.option:
+ if suboption.inherit or ( runtime and suboption.runtime ):
+ for path in getDependOutputList(project,pctxt,suboption,context,visited):
+ if not path in classpath:
+ classpath.append(path)
return classpath
@@ -670,5 +689,12 @@
cp=getClasspathList(project,workspace,context)
print "Project : " + project.name
for p in cp:
- print " - " + str(p)
+ if isinstance(p,AnnotatedPath):
+ pp='Unnamed'
+ ppp='Unnamed'
+ if p.context: pp=p.context.name
+ if p.pcontext: ppp=p.pcontext.name
+ print " - " + str(p) + " : " + pp + " : " + ppp + " : " + str(p.note)
+ else:
+ print " + " + str(p)
1.82 +16 -2 jakarta-gump/python/gump/document.py
Index: document.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- document.py 17 Oct 2003 20:57:15 -0000 1.81
+++ document.py 17 Oct 2003 23:13:26 -0000 1.82
@@ -681,17 +681,31 @@
startSectionXDoc(x,'Classpath')
startTableXDoc(x)
- x.write(' <tr><th>Path Entry</th><th>Contributor</th></tr>')
+ x.write(' <tr><th>Path
Entry</th><th>Contributor</th><th>Instigator</th><th>Annotation</th></tr>')
classpath=getClasspathList(project,workspace,context)
paths=0
for path in classpath:
if isinstance(path,AnnotatedPath):
pcontext=path.context
+ ppcontext=path.pcontext
+ note=path.note
else:
pcontext=context
+ ppcontext=None
+ note=''
startTableRowXDoc(x)
insertTableDataXDoc(x, path)
+
+ # Contributor
insertTableDataXDoc(x, getContextLink(pcontext))
+
+ # Instigator (if not Gump)
+ link=''
+ if ppcontext: link=getContextLink(ppcontext)
+ insertTableDataXDoc(x, link)
+
+ # Additional Notes...
+ insertTableDataXDoc(x, note)
endTableRowXDoc(x)
paths+=1
if not paths:
@@ -1378,7 +1392,7 @@
def addXItemXDoc(f,t,i=None):
if i:
- f.write(' <li>%s - %s</li>\n' % (t, i))
+ f.write(' <li><strong>%s</strong>%s</li>\n' % (t, i))
else:
f.write(' <li>%s</li>\n' % (t))
1.15 +4 -0 jakarta-gump/site/xdocs/stylesheets/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/site/xdocs/stylesheets/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 9 Jan 2003 09:44:21 -0000 1.14
+++ project.xml 17 Oct 2003 23:13:26 -0000 1.15
@@ -16,6 +16,8 @@
href="/usage.html"/>
<item name="FAQ"
href="/faq.html"/>
+ <item name="Getting Started"
+ href="/gettingstarted.html"/>
</menu>
<menu name="Results">
@@ -62,6 +64,8 @@
href="http://jakarta.apache.org/getinvolved/mail.html"/>
<item name="Search mailing lists"
href="http://marc.theaimsgroup.com/?l=alexandria-dev&r=1&w=2"/>
+ <item name="Wiki"
+ href="http://nagoya.apache.org/wiki/apachewiki.cgi?GumpProjectPages"/>
</menu>
</body>
1.9 +1 -1 jakarta-gump/project/werkz.xml
Index: werkz.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/werkz.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- werkz.xml 10 Feb 2003 09:11:23 -0000 1.8
+++ werkz.xml 17 Oct 2003 23:13:26 -0000 1.9
@@ -4,7 +4,7 @@
<description>werkz: Goal-Oriented Process (GOP) Framework</description>
<url href="http://werkz.werken.com/";>
</url>
- <cvs module="werkz" repository="werken" dir="werkz">
+ <cvs module="codehaus" repository="werken" dir="werkz">
</cvs>
<project name="werkz">
<mkdir dir="target/classes"/>
1.21 +2 -2 jakarta-gump/project/jaxen.xml
Index: jaxen.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jaxen.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jaxen.xml 14 Aug 2003 06:58:03 -0000 1.20
+++ jaxen.xml 17 Oct 2003 23:13:26 -0000 1.21
@@ -14,7 +14,7 @@
<package>org.jaxen</package>
<depend project="packaged-dom4j">
</depend>
- <depend project="jakarta-ant">
+ <depend project="ant">
</depend>
<depend project="jdom">
</depend>
@@ -44,7 +44,7 @@
<package>org.jaxen</package>
<depend project="dom4j">
</depend>
- <depend project="jakarta-ant">
+ <depend project="ant">
</depend>
<depend project="jdom">
</depend>
1.2 +1 -1 jakarta-gump/repository/codehaus.xml
Index: codehaus.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/repository/codehaus.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codehaus.xml 27 Aug 2003 07:33:34 -0000 1.1
+++ codehaus.xml 17 Oct 2003 23:13:26 -0000 1.2
@@ -10,6 +10,6 @@
<user>anonymous</user>
<password></password>
<hostname>cvs.codehaus.org</hostname>
- <path>/cvsroot</path>
+ <path>/scm/cvspublic</path>
</root>
</repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
