brett 2004/02/29 17:52:26 Modified: changelog/src/main/org/apache/maven/changelog ChangeLogEntry.java changelog/xdocs changes.xml Log: PR: MPCHANGELOG-30 Fix CDATA sections in comments Revision Changes Path 1.3 +18 -2 maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLogEntry.java Index: ChangeLogEntry.java =================================================================== RCS file: /home/cvs/maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLogEntry.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLogEntry.java 4 Jul 2003 16:24:46 -0000 1.2 +++ ChangeLogEntry.java 1 Mar 2004 01:52:26 -0000 1.3 @@ -209,7 +209,7 @@ buffer.append("\t\t</file>\n"); } buffer.append("\t\t<msg><![CDATA[") - .append(comment) + .append(removeCDataEnd(comment)) .append("]]></msg>\n"); buffer.append("\t</changelog-entry>\n"); @@ -302,6 +302,22 @@ public String getTimeFormatted() { return TIME_FORMAT.format(getDate()); + } + + /** + * remove a <code>]]></code> from comments (replace it with <code>] ] ></code>). + * @param message + * @return + */ + private String removeCDataEnd(String message) + { + // check for invalid sequence ]]> + int endCdata; + while (message != null && (endCdata = message.indexOf("]]>")) > -1) + { + message = message.substring(0, endCdata) + "] ] >" + message.substring(endCdata + 3, message.length()); + } + return message; } /** 1.22 +3 -0 maven-plugins/changelog/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven-plugins/changelog/xdocs/changes.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- changes.xml 4 Feb 2004 00:40:33 -0000 1.21 +++ changes.xml 1 Mar 2004 01:52:26 -0000 1.22 @@ -24,6 +24,9 @@ <action dev="jcrossley" type="update" issue="MPCHANGELOG-7"> Add support for Perforce SCM and cleaned up some docs. </action> + <action dev="brett" type="fix" issue="MPCHANGELOG-30" due-to="fabrizio giustina"> + Fix CDATA sections in comments. + </action> </release> <release version="1.3" date="2003-09-29">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]