Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/plugin.jelly,v
retrieving revision 1.10
diff -u -r1.10 plugin.jelly
--- plugin.jelly	3 Feb 2004 10:54:48 -0000	1.10
+++ plugin.jelly	6 Feb 2004 17:40:03 -0000
@@ -61,6 +61,7 @@
             range="${maven.changelog.range}"
             repositoryConnection="${_connection}"
             dateFormat="${maven.changelog.dateformat}"
+            commentFormat="${maven.changelog.commentFormat}"
             />
 
           <doc:jsl
cvs server: Diffing src
cvs server: Diffing src/main
cvs server: Diffing src/main/org
cvs server: Diffing src/main/org/apache
cvs server: Diffing src/main/org/apache/maven
cvs server: Diffing src/main/org/apache/maven/changelog
Index: src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java,v
retrieving revision 1.4
diff -u -r1.4 AbstractChangeLogGenerator.java
--- src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java	30 Mar 2003 22:51:11 -0000	1.4
+++ src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java	6 Feb 2004 17:40:03 -0000
@@ -130,6 +130,11 @@
    */
   protected InputStream in;
 
+  /**
+   * The comment format string used in interrogating the RCS.
+   */
+  protected String commentFormat;
+
   /** Log */
   private static final Log LOG = LogFactory.getLog(AbstractChangeLogGenerator.class);
 
@@ -155,6 +160,9 @@
     }
 
     setConnection(changeLogExecutor.getRepositoryConnection());
+
+    // set the comment query string for the RCS.
+    setCommentFormat(changeLogExecutor.getCommentFormat());
   }
 
   /**
@@ -331,6 +339,24 @@
   public void setConnection(String connection)
   {
     this.connection = connection;
+  }
+
+  /**
+   * Returns the commentFormat used to interrogate the RCS.
+   * @return String
+   */
+  public String getCommentFormat()
+  {
+    return commentFormat;
+  }
+
+  /**
+   * Sets the commentFormat.
+   * @param commentFormat The commentFormat to set
+   */
+  public void setCommentFormat(String commentFormat)
+  {
+    this.commentFormat = commentFormat;
   }
 
   /**
Index: src/main/org/apache/maven/changelog/ChangeLog.java
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLog.java,v
retrieving revision 1.4
diff -u -r1.4 ChangeLog.java
--- src/main/org/apache/maven/changelog/ChangeLog.java	27 Feb 2003 10:30:33 -0000	1.4
+++ src/main/org/apache/maven/changelog/ChangeLog.java	6 Feb 2004 17:40:03 -0000
@@ -134,6 +134,13 @@
     private String outputEncoding;
 
     /**
+     * Comment format string used for interrogating
+     * the revision control system.
+     * Currently only used by the ClearcaseChangeLogGenerator.
+     */
+    private String commentFormat;
+
+    /**
      * Set the ChangeLogFactory class name.  If this isn't set, the factory
      * defaults to Maven's build in CVS factory.
      *
@@ -452,6 +459,24 @@
     public void setOutputEncoding(String outputEncoding)
     {
         this.outputEncoding = outputEncoding;
+    }
+
+    /**
+     * Returns the commentFormat used to interrogate the RCS.
+     * @return String
+     */
+    public String getCommentFormat()
+    {
+        return commentFormat;
+    }
+
+    /**
+     * Sets the commentFormat.
+     * @param commentFormat The commentFormat to set
+     */
+    public void setCommentFormat(String commentFormat)
+    {
+        this.commentFormat = commentFormat;
     }
 
 } // end of ChangeLog
cvs server: Diffing src/main/org/apache/maven/clearcaselib
Index: src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java,v
retrieving revision 1.1
diff -u -r1.1 ClearcaseChangeLogGenerator.java
--- src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java	21 Sep 2003 13:09:44 -0000	1.1
+++ src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java	6 Feb 2004 17:40:03 -0000
@@ -101,11 +101,22 @@
         Commandline command = new Commandline();
         command.setExecutable("cleartool");
         command.createArgument().setValue("lshistory");
-        
+
         StringBuffer format = new StringBuffer();
         format.append("NAME:%En\\n");
         format.append("DATE:%Nd\\n");    
-        format.append("COMM:%-12.12o - %o - %c - Activity: %[activity]p\\n");
+        format.append("COMM:%-12.12o - ");
+
+        String commentFormat = getCommentFormat();
+        if (commentFormat == null)
+        {
+            format.append("%Sn - %c - Activity: %[activity]p\\n");
+        }
+        else
+        {
+            format.append(commentFormat);
+        }
+             
         format.append("USER:%-8.8u\\n");
 
         command.createArgument().setValue("-fmt");
Index: src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java,v
retrieving revision 1.2
diff -u -r1.2 ClearcaseChangeLogParser.java
--- src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java	25 Oct 2003 17:50:37 -0000	1.2
+++ src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java	6 Feb 2004 17:40:03 -0000
@@ -215,7 +215,7 @@
             return;
         }
         // do not add if the operation is not checkin
-        if (entry.getComment().indexOf("- checkin") == -1)
+        if (entry.getComment().indexOf("checkin ") == -1)
         {
             return;
         }
@@ -224,6 +224,8 @@
             + entry.getAuthor() + entry.getComment();
         
                 
+        file.setRevision("");
+
         if (!entries.containsKey(key))
         {
             entry.addFile(file);
cvs server: Diffing src/main/org/apache/maven/cvslib
cvs server: Diffing src/main/org/apache/maven/perforcelib
cvs server: Diffing src/main/org/apache/maven/starteamlib
cvs server: Diffing src/main/org/apache/maven/svnlib
cvs server: Diffing src/main/org/apache/maven/util
cvs server: Diffing src/plugin-resources
Index: src/plugin-resources/changelog.jsl
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/src/plugin-resources/changelog.jsl,v
retrieving revision 1.6
diff -u -r1.6 changelog.jsl
--- src/plugin-resources/changelog.jsl	4 Feb 2004 00:40:33 -0000	1.6
+++ src/plugin-resources/changelog.jsl	6 Feb 2004 17:40:03 -0000
@@ -69,9 +69,12 @@
                         <a href="${repository}${name}?ac=22">${name}</a>
                         <a href="${repository}${name}?ac=64&amp;rev1=${revision}">v${revision}</a>
                       </j:when>
+                      <j:when test="${pom.repository.connection.startsWith('scm:clearcase')}">
+                        <a href="${repository}${name}${oneRepoParam}">${name}</a>
+                      </j:when>
                       <j:otherwise>
-                    <a href="${repository}${name}${oneRepoParam}">${name}</a>
-                    <a href="${repository}${name}?rev=${revision}&amp;content-type=text/vnd.viewcvs-markup${multiRepoParam}">v${revision}</a>
+                        <a href="${repository}${name}${oneRepoParam}">${name}</a>
+                        <a href="${repository}${name}?rev=${revision}&amp;content-type=text/vnd.viewcvs-markup${multiRepoParam}">v${revision}</a>
                       </j:otherwise>
                     </j:choose>
 
cvs server: Diffing src/test
cvs server: Diffing src/test/org
cvs server: Diffing src/test/org/apache
cvs server: Diffing src/test/org/apache/maven
cvs server: Diffing src/test/org/apache/maven/changelog
cvs server: Diffing src/test/org/apache/maven/cvslib
cvs server: Diffing src/test/org/apache/maven/perforcelib
cvs server: Diffing src/test/org/apache/maven/starteamlib
cvs server: Diffing src/test/org/apache/maven/svnlib
cvs server: Diffing src/test-resources
cvs server: Diffing src/test-resources/cvslib
cvs server: Diffing src/test-resources/perforcelib
cvs server: Diffing src/test-resources/starteamlib
cvs server: Diffing src/test-resources/svnlib
cvs server: Diffing xdocs
Index: xdocs/changes.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/xdocs/changes.xml,v
retrieving revision 1.21
diff -u -r1.21 changes.xml
--- xdocs/changes.xml	4 Feb 2004 00:40:33 -0000	1.21
+++ xdocs/changes.xml	6 Feb 2004 17:40:03 -0000
@@ -8,7 +8,7 @@
 
   <body>
 
-  	<release version="1.4" date="in CVS">
+    <release version="1.4" date="in CVS">
       <action dev="dion" type="fix" issue="MPCHANGELOG-28">Fix bad HTML</action>
   	  <action dev="evenisse" type="update">
   	    Add maven.changelog.basedir property.
@@ -23,6 +23,10 @@
       </action>
       <action dev="jcrossley" type="update" issue="MPCHANGELOG-7">
         Add support for Perforce SCM and cleaned up some docs.
+      </action>
+      <action dev="npalmer" type="fix" issue="MPCHANGELOG-10">
+        Corrected link for viewcvs configured with muliple cvs 
+        repository.
       </action>
     </release>
 
Index: xdocs/properties.xml
===================================================================
RCS file: /home/cvspublic/maven-plugins/changelog/xdocs/properties.xml,v
retrieving revision 1.5
diff -u -r1.5 properties.xml
--- xdocs/properties.xml	3 Feb 2004 10:54:48 -0000	1.5
+++ xdocs/properties.xml	6 Feb 2004 17:40:03 -0000
@@ -33,6 +33,15 @@
           </td>
         </tr>
         <tr>
+          <td>maven.changelog.commentFormat</td>
+          <td>Yes</td>
+          <td>
+            Specifies the RCS query to use when generating the comment for change log.
+            This is currently only used by the Clearcase change log.  The default value is
+            <code>%Sn - %c - Activity: %[activity]p\\n</code> days.
+          </td>
+        </tr>
+        <tr>
           <td>maven.changelog.factory</td>
           <td>Yes</td>
           <td>