Author: nlebas
Date: Sat Jun 22 14:40:34 2013
New Revision: 1495740
URL: http://svn.apache.org/r1495740
Log:
applied Oracle-provided patch for CVE-2013-1571
Modified:
tiles/site/staging/2.0/framework/apidocs/index.html
tiles/site/staging/2.0/framework/testapidocs/index.html
tiles/site/staging/2.1/framework/apidocs/index.html
tiles/site/staging/2.1/framework/testapidocs/index.html
tiles/site/staging/2.2/framework/apidocs/index.html
tiles/site/staging/2.2/framework/testapidocs/index.html
tiles/site/staging/eval/apidocs/index.html
tiles/site/staging/framework/apidocs/index.html
tiles/site/staging/framework/testapidocs/index.html
tiles/site/staging/framework/tutorial/configuration.html
tiles/site/staging/tiles-autotag/apidocs/index.html
tiles/site/staging/tiles-request/apidocs/index.html
tiles/site/staging/tiles-showcase/apidocs/index.html
Modified: tiles/site/staging/2.0/framework/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/2.0/framework/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/2.0/framework/apidocs/index.html (original)
+++ tiles/site/staging/2.0/framework/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -13,6 +13,42 @@ Tiles 2 2.0.7 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/2.0/framework/testapidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/2.0/framework/testapidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/2.0/framework/testapidocs/index.html (original)
+++ tiles/site/staging/2.0/framework/testapidocs/index.html Sat Jun 22 14:40:34
2013
@@ -13,6 +13,42 @@ Tiles 2 2.0.7 Test API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/2.1/framework/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/2.1/framework/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/2.1/framework/apidocs/index.html (original)
+++ tiles/site/staging/2.1/framework/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -13,6 +13,42 @@ Tiles 2 2.1.4 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/2.1/framework/testapidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/2.1/framework/testapidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/2.1/framework/testapidocs/index.html (original)
+++ tiles/site/staging/2.1/framework/testapidocs/index.html Sat Jun 22 14:40:34
2013
@@ -13,6 +13,42 @@ Tiles 2 2.1.4 Test API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/2.2/framework/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/2.2/framework/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/2.2/framework/apidocs/index.html (original)
+++ tiles/site/staging/2.2/framework/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -13,6 +13,42 @@ Tiles 2 2.2.2 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/2.2/framework/testapidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/2.2/framework/testapidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/2.2/framework/testapidocs/index.html (original)
+++ tiles/site/staging/2.2/framework/testapidocs/index.html Sat Jun 22 14:40:34
2013
@@ -13,6 +13,42 @@ Tiles 2 2.1.3 Test API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/eval/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/eval/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/eval/apidocs/index.html (original)
+++ tiles/site/staging/eval/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -11,6 +11,42 @@
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/framework/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/framework/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/framework/apidocs/index.html (original)
+++ tiles/site/staging/framework/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -13,6 +13,42 @@ Tiles 3 3.0.1 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/framework/testapidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/framework/testapidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/framework/testapidocs/index.html (original)
+++ tiles/site/staging/framework/testapidocs/index.html Sat Jun 22 14:40:34 2013
@@ -13,6 +13,42 @@ Tiles 2 2.1.3 Test API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/framework/tutorial/configuration.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/framework/tutorial/configuration.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/framework/tutorial/configuration.html (original)
+++ tiles/site/staging/framework/tutorial/configuration.html Sat Jun 22
14:40:34 2013
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<!-- Generated by Apache Maven Doxia at Jul 11, 2012 -->
+<!-- Generated by Apache Maven Doxia at Mar 4, 2013 -->
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -10,7 +10,7 @@
@import url("../css/site.css");
</style>
<link rel="stylesheet" href="../css/print.css" type="text/css"
media="print" />
- <meta name="Date-Revision-yyyymmdd" content="20120711" />
+ <meta name="Date-Revision-yyyymmdd" content="20130304" />
<meta http-equiv="Content-Language" content="en" />
</head>
@@ -30,8 +30,8 @@
<div class="xleft">
- <span id="publishDate">Last Published: 2012-07-11</span>
- | <span id="projectVersion">Version: 3.0.1</span>
+ <span id="publishDate">Last Published: 2013-03-04</span>
+ | <span id="projectVersion">Version:
3.1-SNAPSHOT</span>
</div>
<div class="xright"> <a
href="http://www.apache.org"; class="externalLink" title="Apache">Apache</a>
|
@@ -191,7 +191,7 @@
<div id="bodyColumn">
<div id="contentBox">
<!-- $Id: configuration.apt 1310865 2012-04-07 21:01:22Z nlebas $
--><!-- --><!-- Licensed to the Apache Software Foundation (ASF) under one
--><!-- or more contributor license agreements. See the NOTICE file --><!--
distributed with this work for additional information --><!-- regarding
copyright ownership. The ASF licenses this file --><!-- to you under the
Apache License, Version 2.0 (the --><!-- "License"); you may not use this file
except in compliance --><!-- with the License. You may obtain a copy of the
License at --><!-- --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--
--><!-- Unless required by applicable law or agreed to in writing, --><!--
software distributed under the License is distributed on an --><!-- "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or
implied. See the License for the --><!-- specific language governing
permissions and limitations --><!-- under the License. --><!-- --><div class="s
ection"><h2>Configuring Tiles in your web application<a
name="Configuring_Tiles_in_your_web_application"></a></h2><p>Tiles has always
been a web application package, usually used in conjunction with Struts. Apache
Tiles™ evolved to the point of being technology-independent, but its use
in a Servlet-based web application is still the most frequent use case.</p><div
class="section"><h3>Required libraries<a
name="Required_libraries"></a></h3><p>The first thing is to install the
required libraries. For the purpose of this tutorial, we will install
everything: the more we can do, the better. Just know that a more
"lightweight" but limited configuration is available.</p><p>If you're
using maven, just include this dependency, it will include the
rest:</p><div><pre><groupId>org.apache.tiles</groupId>
-<artefactId>tiles-extras</artefactId></pre></div><p>If you're not
using maven, just <a href="/download.html">download</a> tiles and copy all the
jars into the /WEB-INF/lib directory.</p></div><div
class="section"><h3>Starting Tiles engine<a
name="Starting_Tiles_engine"></a></h3><p>Load the tiles container by using the
appropriate listener it in your <tt>web.xml</tt> file. Since we decided to load
everything, we'll use
<tt>CompleteAutoloadTilesListener</tt>:</p><div><pre><listener>
+<artifactId>tiles-extras</artifactId></pre></div><p>If you're not
using maven, just <a href="/download.html">download</a> tiles and copy all the
jars into the /WEB-INF/lib directory.</p></div><div
class="section"><h3>Starting Tiles engine<a
name="Starting_Tiles_engine"></a></h3><p>Load the tiles container by using the
appropriate listener it in your <tt>web.xml</tt> file. Since we decided to load
everything, we'll use
<tt>CompleteAutoloadTilesListener</tt>:</p><div><pre><listener>
<listener-class>org.apache.tiles.extras.complete.CompleteAutoloadTilesListener</listener-class>
</listener></pre></div><p>For this tutorial, we'll configure Tiles to
work directly with the servlet API, without a controller. In the real world,
you'll probably use an MVC framework like Struts or Shale or Spring. You have
to configure your framework to work with Tiles; please refer to your
framework's documentation for that. For now, we'll just declare
<tt>TilesDispatchServlet</tt> in <tt>web.xml</tt>:</p><div><pre><servlet>
<servlet-name>Tiles Dispatch Servlet</servlet-name>
@@ -208,7 +208,7 @@
</div>
<div id="footer">
<div class="xright">
- Copyright © 2001-2012
+ Copyright © 2001-2013
<a href="http://www.apache.org";>Apache Software
Foundation</a>.
All Rights Reserved.
Modified: tiles/site/staging/tiles-autotag/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/tiles-autotag/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/tiles-autotag/apidocs/index.html (original)
+++ tiles/site/staging/tiles-autotag/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -13,6 +13,42 @@ Autotags 1.1.0 API
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
Modified: tiles/site/staging/tiles-request/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/tiles-request/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/tiles-request/apidocs/index.html (original)
+++ tiles/site/staging/tiles-request/apidocs/index.html Sat Jun 22 14:40:34 2013
@@ -11,6 +11,42 @@
targetPage = targetPage.substring(1);
if (targetPage.indexOf(":") != -1)
targetPage = "undefined";
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
function loadFrames() {
if (targetPage != "" && targetPage != "undefined")
top.classFrame.location = top.targetPage;
@@ -31,4 +67,4 @@
<p>This document is designed to be viewed using the frames feature. If you see
this message, you are using a non-frame-capable web client. Link to <a
href="overview-summary.html">Non-frame version</a>.</p>
</noframes>
</frameset>
-</html>
\ No newline at end of file
+</html>
Modified: tiles/site/staging/tiles-showcase/apidocs/index.html
URL:
http://svn.apache.org/viewvc/tiles/site/staging/tiles-showcase/apidocs/index.html?rev=1495740&r1=1495739&r2=1495740&view=diff
==============================================================================
--- tiles/site/staging/tiles-showcase/apidocs/index.html (original)
+++ tiles/site/staging/tiles-showcase/apidocs/index.html Sat Jun 22 14:40:34
2013
@@ -1,37 +1,73 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
"http://www.w3.org/TR/html4/frameset.dtd";>
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Mon Jan 15 21:12:14 MST 2007-->
-<TITLE>
-Generated Documentation (Untitled)
-</TITLE>
-<SCRIPT type="text/javascript">
- targetPage = "" + window.location.search;
- if (targetPage != "" && targetPage != "undefined")
- targetPage = targetPage.substring(1);
- function loadFrames() {
- if (targetPage != "" && targetPage != "undefined")
- top.classFrame.location = top.targetPage;
- }
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-</HEAD>
-<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
-<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
-<FRAME src="overview-frame.html" name="packageListFrame" title="All Packages">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and
interfaces (except non-static nested types)">
-</FRAMESET>
-<FRAME src="overview-summary.html" name="classFrame" title="Package, class and
interface descriptions" scrolling="yes">
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see
this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="overview-summary.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
"http://www.w3.org/TR/html4/frameset.dtd";>
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc on Mon Jan 15 21:12:14 MST 2007-->
+<TITLE>
+Generated Documentation (Untitled)
+</TITLE>
+<SCRIPT type="text/javascript">
+ targetPage = "" + window.location.search;
+ if (targetPage != "" && targetPage != "undefined")
+ targetPage = targetPage.substring(1);
+ if (targetPage != "" && !validURL(targetPage))
+ targetPage = "undefined";
+ function validURL(url) {
+ var pos = url.indexOf(".html");
+ if (pos == -1 || pos != url.length - 5)
+ return false;
+ var allowNumber = false;
+ var allowSep = false;
+ var seenDot = false;
+ for (var i = 0; i < url.length - 5; i++) {
+ var ch = url.charAt(i);
+ if ('a' <= ch && ch <= 'z' ||
+ 'A' <= ch && ch <= 'Z' ||
+ ch == '$' ||
+ ch == '_') {
+ allowNumber = true;
+ allowSep = true;
+ } else if ('0' <= ch && ch <= '9'
+ || ch == '-') {
+ if (!allowNumber)
+ return false;
+ } else if (ch == '/' || ch == '.') {
+ if (!allowSep)
+ return false;
+ allowNumber = false;
+ allowSep = false;
+ if (ch == '.')
+ seenDot = true;
+ if (ch == '/' && seenDot)
+ return false;
+ } else {
+ return false;
+ }
+ }
+ return true;
+ }
+ function loadFrames() {
+ if (targetPage != "" && targetPage != "undefined")
+ top.classFrame.location = top.targetPage;
+ }
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+</HEAD>
+<FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
+<FRAMESET rows="30%,70%" title="" onLoad="top.loadFrames()">
+<FRAME src="overview-frame.html" name="packageListFrame" title="All Packages">
+<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and
interfaces (except non-static nested types)">
+</FRAMESET>
+<FRAME src="overview-summary.html" name="classFrame" title="Package, class and
interface descriptions" scrolling="yes">
+<NOFRAMES>
+<H2>
+Frame Alert</H2>
+
+<P>
+This document is designed to be viewed using the frames feature. If you see
this message, you are using a non-frame-capable web client.
+<BR>
+Link to<A HREF="overview-summary.html">Non-frame version.</A>
+</NOFRAMES>
+</FRAMESET>
+</HTML>
