bodewig     02/03/26 02:22:01

  Modified:    proposal/gump/project jakarta-ant.xml
               proposal/gump/java Project.java
  Log:
  first steps to move nagging into project descriptors
  
  Revision  Changes    Path
  1.49      +15 -0     jakarta-alexandria/proposal/gump/project/jakarta-ant.xml
  
  Index: jakarta-ant.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/project/jakarta-ant.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- jakarta-ant.xml   24 Mar 2002 13:53:19 -0000      1.48
  +++ jakarta-ant.xml   26 Mar 2002 10:22:01 -0000      1.49
  @@ -23,6 +23,9 @@
       <home nested="dist"/>
       <jar name="lib/ant.jar" id="ant"/>
       <jar name="lib/optional.jar" id="optional"/>
  +
  +    <nag from="Diane Holt &lt;[EMAIL PROTECTED]&gt;"
  +         to="[EMAIL PROTECTED]"/>
     </project>
   
     <project name="dist-ant">
  @@ -69,6 +72,10 @@
       <work nested="build/testcases"/>
       <work nested="src/testcases"/>
       <work nested="src/etc/testcases"/>
  +
  +    <nag from="Diane Holt &lt;[EMAIL PROTECTED]&gt;"
  +         to="[EMAIL PROTECTED]"
  +         subject="[GUMP] Test Failure - Ant"/>
     </project>
   
     <project name="bootstrap-ant">
  @@ -78,6 +85,14 @@
   
       <home nested="bootstrap"/>
       <jar name="lib/ant.jar"/>
  +
  +    <nag from="Diane Holt &lt;[EMAIL PROTECTED]&gt;"
  +         to="[EMAIL PROTECTED]"
  +         subject="[GUMP] Bootstrap Failure - Ant">
  +      <regex pattern="/error/"/>
  +      <regex pattern="/Failed/"/>
  +      <regex pattern="/BUILD FAILED/"/>      
  +    </nag>
     </project>
   
     <project name="jakarta-ant-myrmidon">
  
  
  
  1.38      +18 -0     jakarta-alexandria/proposal/gump/java/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Project.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Project.java      20 Mar 2002 18:00:25 -0000      1.37
  +++ Project.java      26 Mar 2002 10:22:01 -0000      1.38
  @@ -107,6 +107,8 @@
                   jars.put(((Element)child).getAttribute("id"), child);
               } else if (child.getNodeName().equals("deliver")) {
                   deliver.add(child);
  +            } else if (child.getNodeName().equals("nag")) {
  +                expandNag((Element) child);
               }
           }
   
  @@ -696,6 +698,22 @@
                   deliver.setAttribute("fromdir", srcdir + "/" + fromdir);
                   site.appendChild(deliver);
               }
  +        }
  +    }
  +
  +    /**
  +     * Add default values for subjects and regexp if none have been
  +     * specified.
  +     */
  +    private void expandNag(Element nag) {
  +        if (nag.getAttribute("subject").equals("")) {
  +            nag.setAttribute("subject", "[GUMP] Build Failure - "+name);
  +        }
  +        
  +        if (!nag.hasChildNodes()) {
  +            Element regexp = nag.getOwnerDocument().createElement("regexp");
  +            regexp.setAttribute("pattern", "/BUILD FAILED/");
  +            nag.appendChild(regexp);
           }
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to