Author: markt
Date: Sun Feb 1 19:28:35 2015
New Revision: 1656351
URL: http://svn.apache.org/r1656351
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57496
Use a relative URL. Re-word so full URL is not required.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 1 19:28:35 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656350
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1656351&r1=1656350&r2=1656351&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sun Feb 1 19:28:35 2015
@@ -84,6 +84,9 @@
<bug>57503</bug>: Make clear that the JULI integration for log4j only
works with log4j 1.2.x. (markt)
</fix>
+ <fix>
+ <bug>57496</bug>: Remove hard-coded URL in JSP SVG example. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Tribes">
Modified: tomcat/tc8.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html?rev=1656351&r1=1656350&r2=1656351&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html
(original)
+++ tomcat/tc8.0.x/trunk/webapps/examples/jsp/jsp2/jspx/svgexample.html Sun Feb
1 19:28:35 2015
@@ -31,20 +31,16 @@
tab image). JSPX is a natural fit for generating dynamic XML content
such as SVG.
<p>
- To execute this example, follow these steps:
+ To execute this example you will need a browser with basic SVG support. Any
+ remotely recent browser should have this.
<ol>
- <li>Download <a
href="http://xmlgraphics.apache.org/batik/index.html";>Apache Batik</a>,
- or any other SVG viewer.</li>
- <li>Copy the following URL:
- <a
href="http://localhost:8080/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX";>
-
http://localhost:8080/examples/jsp/jsp2/jspx/textRotate.jspx?name=JSPX</a>
- </li>
- <li>Paste the URL into Batik's Location field and press Enter</li>
+ <li>Use this URL:
+ <a href="textRotate.jspx?name=JSPX">textRotate.jspx?name=JSPX</a></li>
<li>Customize by changing the name=JSPX parameter</li>
</ol>
<p style="margin-top: 2em;">
- The following is a screenshot of the resulting image, for those that
- don't have an SVG viewer:<br>
+ The following is a screenshot of the resulting image, for those using a
+ browser without SVG support:<br>
<img src="textRotate.jpg" alt="[Screenshot image]" style="border: 1px
solid #000;">
</body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
