dion 02/05/11 07:03:58
Modified: src/templates/build default.properties build-docs.xml
xdocs/ref properties.xml
src/java/org/apache/maven/changelog ChangeLog.java
Log:
Patch from St�phane MOR to change the output encoding to ISO-8859-1 rather than
UTF8, as UTF8 was causing weird characters, and ISO-8859-1 was the
default of Anakia.
This is a temporary change until the DVSL guys fix it permanently there.
Revision Changes Path
1.36 +1 -0 jakarta-turbine-maven/src/templates/build/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/default.properties,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- default.properties 10 May 2002 03:19:33 -0000 1.35
+++ default.properties 11 May 2002 14:03:58 -0000 1.36
@@ -20,6 +20,7 @@
maven.docs.src = ${basedir}/xdocs
maven.docs.dest = ${basedir}/docs
+maven.docs.outputencoding = ISO-8859-1
maven.gen.docs = ${maven.build.dir}/generated-xdocs
maven.repo.remote = http://jakarta.apache.org/turbine/jars/
1.70 +6 -3 jakarta-turbine-maven/src/templates/build/build-docs.xml
Index: build-docs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-docs.xml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- build-docs.xml 10 May 2002 11:31:40 -0000 1.69
+++ build-docs.xml 11 May 2002 14:03:58 -0000 1.70
@@ -170,7 +170,8 @@
force="true"
toolboxfile="${maven.home}/stylesheets/toolbox.props"
style="${maven.home}/stylesheets/developer-activity.dvsl"
- includes="activity-log.xml">
+ includes="activity-log.xml"
+ outputencoding="${maven.docs.outputencoding}">
<!--excludes="**/project.xml,**/template.xml"-->
<!-- Need to add the maven jar to load the toolbox -->
<classpath refid="maven-classpath"/>
@@ -252,7 +253,8 @@
toolboxfile="${maven.home}/stylesheets/toolbox.props"
style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
- includes="**/*.xml">
+ includes="**/*.xml"
+ outputencoding="${maven.docs.outputencoding}">
<!-- Need to add the maven jar to load the toolbox -->
<classpath refid="maven-classpath"/>
<tool name="toolbox.string.basedir" value="${basedir}"/>
@@ -272,7 +274,8 @@
toolboxfile="${maven.home}/stylesheets/toolbox.props"
style="${maven.home}/stylesheets/site.dvsl"
excludes="**/project.xml,**/template.xml"
- includes="**/*.xml">
+ includes="**/*.xml"
+ outputencoding="${maven.docs.outputencoding}">
<!-- Need to add the maven jar to load the toolbox -->
<classpath refid="maven-classpath"/>
<tool name="toolbox.string.basedir" value="${basedir}"/>
1.13 +11 -0 jakarta-turbine-maven/xdocs/ref/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/properties.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- properties.xml 10 May 2002 11:31:40 -0000 1.12
+++ properties.xml 11 May 2002 14:03:58 -0000 1.13
@@ -1265,6 +1265,17 @@
<code>http://www.apache.org/~jvanzyl/maven/update</code>.
</td>
</tr>
+ <tr>
+ <td>maven.docs.outputencoding</td>
+ <td>Yes</td>
+ <td>
+ Specifies the output encoding of the DVSL generated docs.
+ The default value is <code>ISO-8859-1</code>, an encoding supporting
+ english characters as well as most
+ <a href="http://www.w3.org/International/O-charset-lang.html";>
+ european languages.</a>
+ </td>
+ </tr>
</table>
</section>
</body>
1.2 +5 -5
jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog.java 30 Apr 2002 14:40:59 -0000 1.1
+++ ChangeLog.java 11 May 2002 14:03:58 -0000 1.2
@@ -83,7 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
- * @version $Id: ChangeLog.java,v 1.1 2002/04/30 14:40:59 dion Exp $
+ * @version $Id: ChangeLog.java,v 1.2 2002/05/11 14:03:58 dion Exp $
*/
public class ChangeLog extends ProjectExecutor
{
@@ -196,7 +196,7 @@
* @throws FileNotFoundException if {@link ChangeLog#base} doesn't exist
* @throws IOException if there are problems running CVS
* @throws UnsupportedEncodingException if the underlying platform doesn't
- * support UTF-8 encoding
+ * support ISO-8859-1 encoding
*/
public void doExecute() throws FileNotFoundException, IOException,
UnsupportedEncodingException
@@ -334,14 +334,14 @@
* @throws FileNotFoundException when the output file previously provided
* does not exist
* @throws UnsupportedEncodingException when the platform doesn't support
- * UTF-8 encoding
+ * ISO-8859-1 encoding
*/
private void createDocument() throws FileNotFoundException,
UnsupportedEncodingException
{
PrintWriter out = new PrintWriter(new OutputStreamWriter(
- new FileOutputStream(output), "UTF-8"));
+ new FileOutputStream(output), "ISO-8859-1"));
out.println(toXML());
out.flush();
out.close();
@@ -353,7 +353,7 @@
private String toXML()
{
StringBuffer buffer = new StringBuffer();
- buffer.append( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" )
+ buffer.append( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" )
.append("<document>\n")
.append("<properties><title>Change Log</title></properties>\n")
.append("<body>\n")
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
