jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1695351 - in /jmeter/trunk: build.xml xdocs/stylesheets/site.vsl xdocs/stylesheets/site_printable.vsl xdocs/velocity.properties
Date Tue, 11 Aug 2015 18:55:38 GMT
Author: fschumacher
Date: Tue Aug 11 18:55:37 2015
New Revision: 1695351

URL: http://svn.apache.org/r1695351
Log:
Followup to r1677049. As the rarr html entity is utf-8, convert the printable docs to utf-8,
also.

Modified:
    jmeter/trunk/build.xml
    jmeter/trunk/xdocs/stylesheets/site.vsl
    jmeter/trunk/xdocs/stylesheets/site_printable.vsl
    jmeter/trunk/xdocs/velocity.properties

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1695351&r1=1695350&r2=1695351&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Tue Aug 11 18:55:37 2015
@@ -2266,9 +2266,9 @@ run JMeter unless all the JMeter jars ar
     Otherwise the output from the build will depend on which is done first.
     -->
     <echo level="info">Fixing EOL</echo>
-    <fixcrlf encoding="iso-8859-1" srcdir="${dest.docs}/" includes="**/*.html" excludes="api/**"
fixlast="false"/>
+    <fixcrlf encoding="utf-8" srcdir="${dest.docs}/" includes="**/*.html" excludes="api/**"
fixlast="false"/>
     <echo level="info">Removing unnecessary &lt;/br> tags</echo>
-    <replace encoding="iso-8859-1" dir="${dest.docs}/" includes="**/*.html" excludes="api/**"
token="&lt;/br>" value=""/>
+    <replace encoding="utf-8" dir="${dest.docs}/" includes="**/*.html" excludes="api/**"
token="&lt;/br>" value=""/>
     <copy todir="${dest.docs}/demos">
       <fileset dir="${src.demos}"/>
     </copy>
@@ -2290,9 +2290,9 @@ run JMeter unless all the JMeter jars ar
         excludes="**/stylesheets/** extending.xml extending/*.xml"
         includes="**/*.xml" lastModifiedCheck="${anakia.lastModifiedCheck}" velocityPropertiesFile="${src.docs}/velocity.properties"/>
     <echo level="info">Fixing EOL</echo>
-    <fixcrlf encoding="iso-8859-1" srcdir="${dest.printable_docs}/" includes="**/*.html"
fixlast="false"/>
+    <fixcrlf encoding="utf-8" srcdir="${dest.printable_docs}/" includes="**/*.html" fixlast="false"/>
     <echo level="info">Removing unnecessary &lt;/br> tags</echo>
-    <replace encoding="iso-8859-1" dir="${dest.printable_docs}/" includes="**/*.html"
token="&lt;/br>" value=""/>
+    <replace encoding="utf-8" dir="${dest.printable_docs}/" includes="**/*.html" token="&lt;/br>"
value=""/>
     <!--
     Share images with non-printable version
     Means printable version won't work on web-site

Modified: jmeter/trunk/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/site.vsl?rev=1695351&r1=1695350&r2=1695351&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/site.vsl (original)
+++ jmeter/trunk/xdocs/stylesheets/site.vsl Tue Aug 11 18:55:37 2015
@@ -512,7 +512,7 @@ $node.getText()
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="$cssdir/style.css"/>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 #set ($authors = $root.getChild("properties").getChildren("author"))
 #foreach ( $au in $authors )
 #metaauthor ( $au.getText() $au.getAttributeValue("email") )

Modified: jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=1695351&r1=1695350&r2=1695351&view=diff
==============================================================================
--- jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jmeter/trunk/xdocs/stylesheets/site_printable.vsl Tue Aug 11 18:55:37 2015
@@ -521,7 +521,7 @@ $comp.getAttributeValue("index")
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="$cssdir/style.css"/>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 #set ($authors = $root.getChild("properties").getChildren("author"))
 #foreach ( $au in $authors )
 #metaauthor ( $au.getText() $au.getAttributeValue("email") )

Modified: jmeter/trunk/xdocs/velocity.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/velocity.properties?rev=1695351&r1=1695350&r2=1695351&view=diff
==============================================================================
--- jmeter/trunk/xdocs/velocity.properties (original)
+++ jmeter/trunk/xdocs/velocity.properties Tue Aug 11 18:55:37 2015
@@ -15,4 +15,6 @@
 
 resource.loader.1.resource.path = xdocs/stylesheets
 # set true to debug vsl files
-runtime.references.strict=true
\ No newline at end of file
+runtime.references.strict=true
+input.encoding=utf-8
+output.encoding=utf-8



Mime
View raw message