ajack 2003/12/02 14:36:46
Modified: python/gump engine.py
python/gump/document resolver.py
project ws-axis.xml
src/documentation/content/xdocs/metadata project.xml
. lsd.xml
python/gump/output rss.py
Log:
1) The split ws-axis descriptor I proposed, if they don't like it we can roll back.
2) Some RSS fixes
3) Correct URL for logs on LSD, into lsd.xml
4) Tweaks to the documentation (warnings about Gumpy != Gump)
Revision Changes Path
1.32 +1 -2 jakarta-gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- engine.py 2 Dec 2003 20:19:54 -0000 1.31
+++ engine.py 2 Dec 2003 22:36:46 -0000 1.32
@@ -116,8 +116,7 @@
if run.getGumpSet().isFull():
#
- # Nag about failures -- only if we are allowed to
- #
+ # Nag about failures
#
nag(run)
1.6 +5 -1 jakarta-gump/python/gump/document/resolver.py
Index: resolver.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/document/resolver.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- resolver.py 2 Dec 2003 18:55:12 -0000 1.5
+++ resolver.py 2 Dec 2003 22:36:46 -0000 1.6
@@ -299,7 +299,11 @@
return s
def concatenate(root,part):
- return root+'/'+part
+ conc=root
+ if not conc.endswith('/'):
+ conc+='/'
+ conc+=part
+ return conc
class Resolver:
1.5 +31 -4 jakarta-gump/project/ws-axis.xml
Index: ws-axis.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/ws-axis.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ws-axis.xml 2 Dec 2003 17:36:40 -0000 1.4
+++ ws-axis.xml 2 Dec 2003 22:36:46 -0000 1.5
@@ -18,7 +18,7 @@
<project name="ws-axis">
<package>org.apache.axis</package>
- <ant basedir="java" target="all">
+ <ant basedir="java" target="compile">
<property name="axis.lib.dir" value="lib"/>
<property name="env.ANT_HOME" reference="home" project="ant"/>
<depend name="wsdl4j.jar" project="wsdl4j" id="wsdl4j"/>
@@ -26,15 +26,12 @@
</ant>
<depend project="xml-xerces"/>
- <depend project="xmlunit"/>
<depend project="jakarta-oro"/>
<depend project="ant" inherit="runtime"/>
<depend project="commons-discovery"/>
<depend project="commons-logging"/>
<depend project="jakarta-servletapi-4"/>
- <depend project="httpunit"/>
<option project="commons-httpclient"/>
- <option project="junit"/>
<option project="jimi"/>
<option project="jaf"/>
<option project="javamail"/>
@@ -53,6 +50,36 @@
<license name="LICENSE"/>
<javadoc nested="java/build/javadocs"/>
+
+ <nag from="Sam Ruby <[EMAIL PROTECTED]>"
+ to="[EMAIL PROTECTED]">
+ <regexp subject="Build Failure - Axis"/>
+ <regexp pattern="/timed out/" subject="Build timed out - Axis"/>
+ </nag>
+ </project>
+
+ <!-- test -->
+
+ <project name="ws-axis-test">
+ <package>org.apache.axis</package>
+
+ <ant basedir="java" target="test">
+ <property name="axis.lib.dir" value="lib"/>
+ <property name="env.ANT_HOME" reference="home" project="ant"/>
+ <depend name="wsdl4j.jar" project="wsdl4j" id="wsdl4j"/>
+ <depend name="log4j-core.jar" project="jakarta-log4j" id="log4j"/>
+ </ant>
+
+ <depend project="ws-axis" inherit="all"/>
+ <depend project="xmlunit"/>
+ <depend project="httpunit"/>
+ <option project="junit"/>
+
+ <work nested="java/build/lib/axis-ant.jar"/>
+ <work nested="java/build/classes"/>
+
+ <home nested="java/build"/>
+
<junitreport nested="java/testreports"/>
<nag from="Sam Ruby <[EMAIL PROTECTED]>"
1.3 +18 -2
jakarta-gump/src/documentation/content/xdocs/metadata/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/jakarta-gump/src/documentation/content/xdocs/metadata/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 26 Nov 2003 19:06:44 -0000 1.2
+++ project.xml 2 Dec 2003 22:36:46 -0000 1.3
@@ -332,6 +332,11 @@
<link href="workspace.html#javadoc"><javadoc></link> element is present
in the workspace definition.</p>
+ <warning>
+ <link href="../python/index.html">Python Gump</link> does NOT (currently)
support
+ this feature.
+ </warning>
+
<table>
<tr>
<th>Attribute</th>
@@ -436,7 +441,13 @@
tool outputs are placed. This option only has any meaning if the
<link href="workspace.html#junitreport"><junitreport></link> element
is present in the workspace definition.</p>
-
+
+ <warning>
+ <link href="../python/index.html">Python Gump</link> only takes the nested and
parent
+ references as a directory reference, and lists the contents of the files in that
+ directory. It does this irrespective of any entry in the workspace.
+ </warning>
+
<table>
<tr>
<th>Attribute</th>
@@ -566,7 +577,12 @@
nested regexp element.</td>
</tr>
</table>
-
+
+ <warning>
+ <link href="../python/index.html">Python Gump</link> does not use regular
expressions,
+ it soley relies upon the exit code of the called builder or script.
+ </warning>
+
<p>A build failure is detected by matching the output of the
build against Perl regular expressions, the default expression
is <code>/BUILD FAILED/i</code>. The regular expressions are
1.8 +1 -0 jakarta-gump/lsd.xml
Index: lsd.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/lsd.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lsd.xml 15 Jun 2003 10:50:37 -0000 1.7
+++ lsd.xml 2 Dec 2003 22:36:46 -0000 1.8
@@ -2,6 +2,7 @@
pkgdir="/data/gump/opt"
sync="rsync -r -a --delete"
jardir="/data/gump/log/jars"
+ logurl='http://lsd.student.utwente.nl/gump/'
version="0.3">
<property name="build.sysclasspath" value="only"/>
1.9 +5 -4 jakarta-gump/python/gump/output/rss.py
Index: rss.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/output/rss.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rss.py 2 Dec 2003 17:36:40 -0000 1.8
+++ rss.py 2 Dec 2003 22:36:46 -0000 1.9
@@ -204,7 +204,7 @@
def endRSS(self):
# complete the rss feed
- self.rssStream.write('</rss>')
+ self.rssStream.write('</rss>\n')
log.info("RSS Newsfeed written to : " + self.rssFile);
@@ -248,7 +248,7 @@
Channel(self.workspace.logurl, \
'Jakarta Gump', \
"""Life is like a box of chocolates""", \
- Image('http://jakarta.apache.org/images/bench.png', \
+ Image('http://jakarta.apache.org/gump/images/bench.png', \
'Jakarta Gump', \
'http://jakarta.apache.org/')))
@@ -307,8 +307,9 @@
project.getModule().getName() + ":" + project.getName(), \
('%sT%s%s') % (datestr,timestr,TZ))
- projectRSS.addItem(item)
- moduleRSS.addItem(item)
+ if not s.currentState == STATE_NONE:
+ projectRSS.addItem(item)
+ moduleRSS.addItem(item)
# State changes that are newsworthy...
if s.sequenceInState == 1 \
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
