antoine     2003/06/15 13:26:57

  Modified:    src/main/org/apache/tools/ant/taskdefs/cvslib
                        CvsTagDiff.java
               docs/manual/CoreTasks cvstagdiff.html
               .        WHATSNEW
  Log:
  add cvsroot and package attributes to the output of <cvstagdiff/>
  PR: 16081
  Submitted by: Rob van Oostrum (rob at springwellfarms dot ca)
  
  Revision  Changes    Path
  1.14      +6 -2      
ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
  
  Index: CvsTagDiff.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CvsTagDiff.java   15 Jun 2003 19:37:11 -0000      1.13
  +++ CvsTagDiff.java   15 Jun 2003 20:26:57 -0000      1.14
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -351,6 +351,10 @@
               } else {
                   writer.print("endDate=\"" + m_endDate + "\" ");
               }
  +
  +            writer.print("cvsroot=\"" + getCvsRoot() + "\" ");
  +            writer.print("package=\"" + m_package + "\" ");
  +
               writer.println(">");
               for (int i = 0, c = entries.length; i < c; i++) {
                   writeTagEntry(writer, entries[i]);
  
  
  
  1.8       +5 -1      ant/docs/manual/CoreTasks/cvstagdiff.html
  
  Index: cvstagdiff.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/cvstagdiff.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- cvstagdiff.html   15 Jun 2003 20:03:03 -0000      1.7
  +++ cvstagdiff.html   15 Jun 2003 20:26:57 -0000      1.8
  @@ -161,9 +161,13 @@
   </pre>
   
   <h4>Sample Output</h4>
  +<p>
  +The cvsroot and package attributes of the tagdiff element are new in ant 1.6.
  +</p>
   <pre>
   &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
  -&lt;tagdiff startTag=&quot;ANT_14&quot; endTag=&quot;ANT_141&quot;&gt;
  +&lt;tagdiff startTag=&quot;ANT_14&quot; endTag=&quot;ANT_141&quot; 
  +cvsroot=&quot;:pserver:[EMAIL PROTECTED]:/home/cvspublic&quot; 
package=&quot;ant&quot;&gt;
     &lt;entry&gt;
       &lt;file&gt;
         
&lt;name&gt;src/main/org/apache/tools/ant/DirectoryScanner.java&lt;/name&gt;
  
  
  
  1.436     +5 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.435
  retrieving revision 1.436
  diff -u -r1.435 -r1.436
  --- WHATSNEW  15 Jun 2003 20:03:03 -0000      1.435
  +++ WHATSNEW  15 Jun 2003 20:26:57 -0000      1.436
  @@ -149,6 +149,11 @@
   * <cvstagdiff> had a problem with "dd-MM-yy hh:mm:ss" formats
     Bugzilla Report 15995.
   
  +* <cvstagdiff> cvsroot and package attributes added to the root
  +  element tagdiff of the xml output
  +  Bugzilla Report 16081.
  +
  +
   Other changes:
   --------------
   * Six new Clearcase tasks added.
  
  
  

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

Reply via email to