From 0b4c9ae65f06c8948140a05cc4e4901b1698a852 Mon Sep 17 00:00:00 2001 From: Antoine Levy-Lambert Date: Sun, 15 Jun 2003 20:26:57 +0000 Subject: [PATCH] add cvsroot and package attributes to the output of PR: 16081 Submitted by: Rob van Oostrum (rob at springwellfarms dot ca) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274670 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 5 +++++ docs/manual/CoreTasks/cvstagdiff.html | 6 +++++- .../org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 59876e508..6c806aed7 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -149,6 +149,11 @@ Fixed bugs: * had a problem with "dd-MM-yy hh:mm:ss" formats Bugzilla Report 15995. +* cvsroot and package attributes added to the root + element tagdiff of the xml output + Bugzilla Report 16081. + + Other changes: -------------- * Six new Clearcase tasks added. diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html index d4d595c32..1d7f5021b 100644 --- a/docs/manual/CoreTasks/cvstagdiff.html +++ b/docs/manual/CoreTasks/cvstagdiff.html @@ -161,9 +161,13 @@ how to generate a HTML report from the XML report.

Sample Output

+

+The cvsroot and package attributes of the tagdiff element are new in ant 1.6. +

 <?xml version="1.0" encoding="UTF-8"?>
-<tagdiff startTag="ANT_14" endTag="ANT_141">
+<tagdiff startTag="ANT_14" endTag="ANT_141" 
+cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic" package="ant">
   <entry>
     <file>
       <name>src/main/org/apache/tools/ant/DirectoryScanner.java</name>
diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
index e712c0f70..63ff3a7a9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
+++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
@@ -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 @@ public class CvsTagDiff extends AbstractCvsTask {
             } 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]);