You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by bo...@apache.org on 2003/01/16 15:53:03 UTC
cvs commit: jakarta-gump/java Project.java
bodewig 2003/01/16 06:53:03
Modified: site/xdocs project.xml
java Project.java
Log:
Change default nag pattern to be case-insensitive, i.e. it will now
also match
Buildfile: build.xml does not exist!
Build failed
Revision Changes Path
1.14 +4 -4 jakarta-gump/site/xdocs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/site/xdocs/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 1 Jan 2003 07:24:13 -0000 1.13
+++ project.xml 16 Jan 2003 14:53:03 -0000 1.14
@@ -431,7 +431,7 @@
<p>A build failure is detected by matching the output of the
build against Perl regular expressions, the default expression
- is <code>/BUILD FAILED/</code>. The regular expressions are
+ is <code>/BUILD FAILED/i</code>. The regular expressions are
specified using nested regexp elements - you can associate
different email addresses and subjects with each expression.</p>
@@ -451,7 +451,7 @@
<source><![CDATA[
<nag>
- <regexp pattern="/BUILD FAILED/"
+ <regexp pattern="/BUILD FAILED/i"
from="from@example.org"
to="to@example.org"
subject="Build Failure - @name of project element@"/>
@@ -469,7 +469,7 @@
</p>
<source><![CDATA[
<nag>
- <!-- pattern default is /BUILD FAILED/ -->
+ <!-- pattern default is /BUILD FAILED/i -->
<regexp from="from@example.org"
to="to@example.org"
subject="Build Failure - @name of project element@"/>
@@ -486,7 +486,7 @@
</p>
<source><![CDATA[
<nag>
- <!-- pattern default is /BUILD FAILED/ -->
+ <!-- pattern default is /BUILD FAILED/i -->
<regexp from="from@example.org"
to="to@example.org"
subject="Build Failure - @name of project element@"/>
1.47 +11 -8 jakarta-gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-gump/java/Project.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Project.java 25 Nov 2002 15:24:12 -0000 1.46
+++ Project.java 16 Jan 2003 14:53:03 -0000 1.47
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -92,6 +92,9 @@
private static String nagTo = null;
private static String nagPrefix = null;
+ private static String defaultNagPrefix = "[GUMP]";
+ private static String defaultNagPattern = "/BUILD FAILED/i";
+
/**
* Create a set of Project definitions based on XML nodes.
* @param elements list of <project> elements
@@ -788,12 +791,12 @@
if (nagPrefix == null) {
Element workspaceNag = Workspace.getNag();
if (workspaceNag == null) {
- nagPrefix = "[GUMP]";
+ nagPrefix = defaultNagPrefix;
} else {
if (!workspaceNag.getAttribute("prefix").equals("")) {
nagPrefix = workspaceNag.getAttribute("prefix");
} else {
- nagPrefix = "[GUMP]";
+ nagPrefix = defaultNagPrefix;
}
if (!workspaceNag.getAttribute("to").equals("")) {
nagTo = workspaceNag.getAttribute("to");
@@ -817,7 +820,7 @@
regexp = (Element)child;
if (regexp.getAttribute("pattern").equals("")) {
- regexp.setAttribute("pattern", "/BUILD FAILED/");
+ regexp.setAttribute("pattern", defaultNagPattern);
}
if (regexp.getAttribute("subject").equals("")) {
@@ -839,7 +842,7 @@
if (regexp == null) {
regexp = nag.getOwnerDocument().createElement("regexp");
- regexp.setAttribute("pattern", "/BUILD FAILED/");
+ regexp.setAttribute("pattern", defaultNagPattern);
regexp.setAttribute("subject", subject);
regexp.setAttribute("to", to);
regexp.setAttribute("from", from);