Author: kkolinko
Date: Fri Jan 24 00:47:01 2014
New Revision: 1560858
URL: http://svn.apache.org/r1560858
Log:
Align EL variables names with trunk
s/tomcat7/tomcat/
This is merge of r1520273 minus s/7/8/ change.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1520273
Modified: tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp?rev=1560858&r1=1560857&r2=1560858&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/ROOT/index.jsp Fri Jan 24 00:47:01 2014
@@ -19,9 +19,9 @@ limitations under the License.
<%
java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy");
request.setAttribute("year", sdf.format(new java.util.Date()));
-request.setAttribute("tomcat7Url", "http://tomcat.apache.org/";);
-request.setAttribute("tomcat7DocUrl", "/docs/");
-request.setAttribute("tomcat7ExamplesUrl", "/examples/");
+request.setAttribute("tomcatUrl", "http://tomcat.apache.org/";);
+request.setAttribute("tomcatDocUrl", "/docs/");
+request.setAttribute("tomcatExamplesUrl", "/examples/");
%>
<html lang="en">
<head>
@@ -34,13 +34,13 @@ request.setAttribute("tomcat7ExamplesUrl
<body>
<div id="wrapper">
<div id="navigation" class="curved container">
- <span id="nav-home"><a href="${tomcat7Url}">Home</a></span>
- <span id="nav-hosts"><a
href="${tomcat7DocUrl}">Documentation</a></span>
- <span id="nav-config"><a
href="${tomcat7DocUrl}config/">Configuration</a></span>
- <span id="nav-examples"><a
href="${tomcat7ExamplesUrl}">Examples</a></span>
+ <span id="nav-home"><a href="${tomcatUrl}">Home</a></span>
+ <span id="nav-hosts"><a
href="${tomcatDocUrl}">Documentation</a></span>
+ <span id="nav-config"><a
href="${tomcatDocUrl}config/">Configuration</a></span>
+ <span id="nav-examples"><a
href="${tomcatExamplesUrl}">Examples</a></span>
<span id="nav-wiki"><a
href="http://wiki.apache.org/tomcat/FrontPage";>Wiki</a></span>
- <span id="nav-lists"><a href="${tomcat7Url}lists.html">Mailing
Lists</a></span>
- <span id="nav-help"><a href="${tomcat7Url}findhelp.html">Find
Help</a></span>
+ <span id="nav-lists"><a href="${tomcatUrl}lists.html">Mailing
Lists</a></span>
+ <span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find
Help</a></span>
<br class="separator" />
</div>
<div id="asf-box">
@@ -54,9 +54,9 @@ request.setAttribute("tomcat7ExamplesUrl
<img src="tomcat.png" alt="[tomcat logo]" />
<div id="tasks">
<h3>Recommended Reading:</h3>
- <h4><a
href="${tomcat7DocUrl}security-howto.html">Security Considerations
HOW-TO</a></h4>
- <h4><a
href="${tomcat7DocUrl}manager-howto.html">Manager Application HOW-TO</a></h4>
- <h4><a
href="${tomcat7DocUrl}cluster-howto.html">Clustering/Session Replication
HOW-TO</a></h4>
+ <h4><a
href="${tomcatDocUrl}security-howto.html">Security Considerations
HOW-TO</a></h4>
+ <h4><a
href="${tomcatDocUrl}manager-howto.html">Manager Application HOW-TO</a></h4>
+ <h4><a
href="${tomcatDocUrl}cluster-howto.html">Clustering/Session Replication
HOW-TO</a></h4>
</div>
</div>
<div id="actions">
@@ -79,19 +79,19 @@ request.setAttribute("tomcat7ExamplesUrl
<h3>Developer Quick Start</h3>
<div class="col25">
<div class="container">
- <p><a href="${tomcat7DocUrl}setup.html">Tomcat
Setup</a></p>
- <p><a href="${tomcat7DocUrl}appdev/">First Web
Application</a></p>
+ <p><a href="${tomcatDocUrl}setup.html">Tomcat
Setup</a></p>
+ <p><a href="${tomcatDocUrl}appdev/">First Web
Application</a></p>
</div>
</div>
<div class="col25">
<div class="container">
- <p><a href="${tomcat7DocUrl}realm-howto.html">Realms
& AAA</a></p>
- <p><a
href="${tomcat7DocUrl}jndi-datasource-examples-howto.html">JDBC
DataSources</a></p>
+ <p><a href="${tomcatDocUrl}realm-howto.html">Realms
& AAA</a></p>
+ <p><a
href="${tomcatDocUrl}jndi-datasource-examples-howto.html">JDBC
DataSources</a></p>
</div>
</div>
<div class="col25">
<div class="container">
- <p><a href="${tomcat7ExamplesUrl}">Examples</a></p>
+ <p><a href="${tomcatExamplesUrl}">Examples</a></p>
</div>
</div>
<div class="col25">
@@ -110,26 +110,26 @@ request.setAttribute("tomcat7ExamplesUrl
Users are defined in:</p>
<pre>$CATALINA_HOME/conf/tomcat-users.xml</pre>
<p>In Tomcat 7.0 access to the manager application is
split between
- different users. <a
href="${tomcat7DocUrl}manager-howto.html">Read more...</a></p>
+ different users. <a
href="${tomcatDocUrl}manager-howto.html">Read more...</a></p>
<br />
- <h4><a
href="${tomcat7DocUrl}RELEASE-NOTES.txt">Release Notes</a></h4>
- <h4><a
href="${tomcat7DocUrl}changelog.html">Changelog</a></h4>
- <h4><a href="${tomcat7Url}migration.html">Migration
Guide</a></h4>
- <h4><a href="${tomcat7Url}security.html">Security
Notices</a></h4>
+ <h4><a href="${tomcatDocUrl}RELEASE-NOTES.txt">Release
Notes</a></h4>
+ <h4><a
href="${tomcatDocUrl}changelog.html">Changelog</a></h4>
+ <h4><a href="${tomcatUrl}migration.html">Migration
Guide</a></h4>
+ <h4><a href="${tomcatUrl}security.html">Security
Notices</a></h4>
</div>
</div>
<div id="low-docs" class="">
<div class="curved container">
<h3>Documentation</h3>
- <h4><a href="${tomcat7DocUrl}">Tomcat 7.0
Documentation</a></h4>
- <h4><a href="${tomcat7DocUrl}config/">Tomcat 7.0
Configuration</a></h4>
+ <h4><a href="${tomcatDocUrl}">Tomcat 7.0
Documentation</a></h4>
+ <h4><a href="${tomcatDocUrl}config/">Tomcat 7.0
Configuration</a></h4>
<h4><a
href="http://wiki.apache.org/tomcat/FrontPage";>Tomcat Wiki</a></h4>
<p>Find additional important configuration information
in:</p>
<pre>$CATALINA_HOME/RUNNING.txt</pre>
<p>Developers may be interested in:</p>
<ul>
<li><a
href="http://tomcat.apache.org/bugreport.html";>Tomcat 7.0 Bug Database</a></li>
- <li><a
href="${tomcat7DocUrl}api/index.html">Tomcat 7.0 JavaDocs</a></li>
+ <li><a href="${tomcatDocUrl}api/index.html">Tomcat
7.0 JavaDocs</a></li>
<li><a
href="http://svn.apache.org/repos/asf/tomcat/tc7.0.x/";>Tomcat 7.0 SVN
Repository</a></li>
</ul>
</div>
@@ -137,19 +137,19 @@ request.setAttribute("tomcat7ExamplesUrl
<div id="low-help" class="">
<div class="curved container">
<h3>Getting Help</h3>
- <h4><a href="${tomcat7Url}faq/">FAQ</a> and <a
href="${tomcat7Url}lists.html">Mailing Lists</a></h4>
+ <h4><a href="${tomcatUrl}faq/">FAQ</a> and <a
href="${tomcatUrl}lists.html">Mailing Lists</a></h4>
<p>The following mailing lists are available:</p>
<ul>
- <li id="list-announce"><strong><a
href="${tomcat7Url}lists.html#tomcat-announce">tomcat-announce</a><br />
+ <li id="list-announce"><strong><a
href="${tomcatUrl}lists.html#tomcat-announce">tomcat-announce</a><br />
Important announcements, releases, security
vulnerability notifications. (Low volume).</strong>
</li>
- <li><a
href="${tomcat7Url}lists.html#tomcat-users">tomcat-users</a><br />
+ <li><a
href="${tomcatUrl}lists.html#tomcat-users">tomcat-users</a><br />
User support and discussion
</li>
- <li><a
href="${tomcat7Url}lists.html#taglibs-user">taglibs-user</a><br />
- User support and discussion for <a
href="${tomcat7Url}taglibs/">Apache Taglibs</a>
+ <li><a
href="${tomcatUrl}lists.html#taglibs-user">taglibs-user</a><br />
+ User support and discussion for <a
href="${tomcatUrl}taglibs/">Apache Taglibs</a>
</li>
- <li><a
href="${tomcat7Url}lists.html#tomcat-dev">tomcat-dev</a><br />
+ <li><a
href="${tomcatUrl}lists.html#tomcat-dev">tomcat-dev</a><br />
Development mailing list, including commit
messages
</li>
</ul>
@@ -162,10 +162,10 @@ request.setAttribute("tomcat7ExamplesUrl
<div class="container">
<h4>Other Downloads</h4>
<ul>
- <li><a
href="${tomcat7Url}download-connectors.cgi">Tomcat Connectors</a></li>
- <li><a
href="${tomcat7Url}download-native.cgi">Tomcat Native</a></li>
- <li><a
href="${tomcat7Url}taglibs/">Taglibs</a></li>
- <li><a
href="${tomcat7DocUrl}deployer-howto.html">Deployer</a></li>
+ <li><a
href="${tomcatUrl}download-connectors.cgi">Tomcat Connectors</a></li>
+ <li><a
href="${tomcatUrl}download-native.cgi">Tomcat Native</a></li>
+ <li><a href="${tomcatUrl}taglibs/">Taglibs</a></li>
+ <li><a
href="${tomcatDocUrl}deployer-howto.html">Deployer</a></li>
</ul>
</div>
</div>
@@ -173,10 +173,10 @@ request.setAttribute("tomcat7ExamplesUrl
<div class="container">
<h4>Other Documentation</h4>
<ul>
- <li><a href="${tomcat7Url}connectors-doc/">Tomcat
Connectors</a></li>
- <li><a href="${tomcat7Url}connectors-doc/">mod_jk
Documentation</a></li>
- <li><a href="${tomcat7Url}native-doc/">Tomcat
Native</a></li>
- <li><a
href="${tomcat7DocUrl}deployer-howto.html">Deployer</a></li>
+ <li><a href="${tomcatUrl}connectors-doc/">Tomcat
Connectors</a></li>
+ <li><a href="${tomcatUrl}connectors-doc/">mod_jk
Documentation</a></li>
+ <li><a href="${tomcatUrl}native-doc/">Tomcat
Native</a></li>
+ <li><a
href="${tomcatDocUrl}deployer-howto.html">Deployer</a></li>
</ul>
</div>
</div>
@@ -184,9 +184,9 @@ request.setAttribute("tomcat7ExamplesUrl
<div class="container">
<h4>Get Involved</h4>
<ul>
- <li><a
href="${tomcat7Url}getinvolved.html">Overview</a></li>
- <li><a href="${tomcat7Url}svn.html">SVN
Repositories</a></li>
- <li><a href="${tomcat7Url}lists.html">Mailing
Lists</a></li>
+ <li><a
href="${tomcatUrl}getinvolved.html">Overview</a></li>
+ <li><a href="${tomcatUrl}svn.html">SVN
Repositories</a></li>
+ <li><a href="${tomcatUrl}lists.html">Mailing
Lists</a></li>
<li><a
href="http://wiki.apache.org/tomcat/FrontPage";>Wiki</a></li>
</ul>
</div>
@@ -195,8 +195,8 @@ request.setAttribute("tomcat7ExamplesUrl
<div class="container">
<h4>Miscellaneous</h4>
<ul>
- <li><a
href="${tomcat7Url}contact.html">Contact</a></li>
- <li><a
href="${tomcat7Url}legal.html">Legal</a></li>
+ <li><a
href="${tomcatUrl}contact.html">Contact</a></li>
+ <li><a href="${tomcatUrl}legal.html">Legal</a></li>
<li><a
href="http://www.apache.org/foundation/sponsorship.html";>Sponsorship</a></li>
<li><a
href="http://www.apache.org/foundation/thanks.html";>Thanks</a></li>
</ul>
@@ -206,10 +206,10 @@ request.setAttribute("tomcat7ExamplesUrl
<div class="container">
<h4>Apache Software Foundation</h4>
<ul>
- <li><a href="${tomcat7Url}whoweare.html">Who We
Are</a></li>
- <li><a
href="${tomcat7Url}heritage.html">Heritage</a></li>
+ <li><a href="${tomcatUrl}whoweare.html">Who We
Are</a></li>
+ <li><a
href="${tomcatUrl}heritage.html">Heritage</a></li>
<li><a href="http://www.apache.org";>Apache
Home</a></li>
- <li><a
href="${tomcat7Url}resources.html">Resources</a></li>
+ <li><a
href="${tomcatUrl}resources.html">Resources</a></li>
</ul>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
