Author: rjung
Date: Thu Jan 1 11:16:41 2015
New Revision: 1648816
URL: http://svn.apache.org/r1648816
Log:
Happy New Year 2015
Backport of r1648815 from trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/NOTICE
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/tc8.0.x/trunk/modules/jdbc-pool/NOTICE
tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 11:16:41 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
+/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
Modified: tomcat/tc8.0.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/NOTICE?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/NOTICE (original)
+++ tomcat/tc8.0.x/trunk/NOTICE Thu Jan 1 11:16:41 2015
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2014 The Apache Software Foundation
+Copyright 1999-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/Constants.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/Constants.java Thu
Jan 1 11:16:41 2015
@@ -201,7 +201,7 @@ public class Constants {
HTML_TAIL_SECTION =
"<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2014, Apache Software Foundation</em>"
+
+ " <em>Copyright © 1999-2015, Apache Software Foundation</em>"
+
"</font></center>\n" +
"\n" +
"</body>\n" +
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
Thu Jan 1 11:16:41 2015
@@ -740,7 +740,7 @@ public final class HTMLManagerServlet ex
*/
@Override
public String getServletInfo() {
- return "HTMLManagerServlet, Copyright (c) 1999-2014, The Apache
Software Foundation";
+ return "HTMLManagerServlet, Copyright (c) 1999-2015, The Apache
Software Foundation";
}
/**
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
Thu Jan 1 11:16:41 2015
@@ -111,7 +111,7 @@ public class Constants {
public static final String HTML_TAIL_SECTION =
"<hr size=\"1\" noshade=\"noshade\">\n" +
"<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2014, Apache Software Foundation</em>" +
+ " <em>Copyright © 1999-2015, Apache Software Foundation</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
Modified: tomcat/tc8.0.x/trunk/modules/jdbc-pool/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/modules/jdbc-pool/NOTICE?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/modules/jdbc-pool/NOTICE (original)
+++ tomcat/tc8.0.x/trunk/modules/jdbc-pool/NOTICE Thu Jan 1 11:16:41 2015
@@ -1,5 +1,5 @@
Apache Tomcat JDBC Pool
-Copyright 2008-2014 The Apache Software Foundation
+Copyright 2008-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
(original)
+++ tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp Thu
Jan 1 11:16:41 2015
@@ -32,7 +32,7 @@
<meta http-equiv="cache-control" content="no-cache,must-revalidate"/><!--
HTTP 1.1 -->
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
- <meta name="copyright" content="copyright 2005-2014 the Apache Software
Foundation"/>
+ <meta name="copyright" content="copyright 2005-2015 the Apache Software
Foundation"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Configured ciphers per Connector</title>
</head>
Modified: tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
(original)
+++ tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Thu Jan
1 11:16:41 2015
@@ -51,7 +51,7 @@
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
<meta name="author" content="Cedrik LIME"/>
- <meta name="copyright" content="copyright 2005-2014 the Apache Software
Foundation"/>
+ <meta name="copyright" content="copyright 2005-2015 the Apache Software
Foundation"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration: details for <%= currentSessionId %></title>
</head>
Modified: tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1648816&r1=1648815&r2=1648816&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original)
+++ tomcat/tc8.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Thu Jan
1 11:16:41 2015
@@ -43,7 +43,7 @@
<meta http-equiv="expires" content="0"/><!-- 0 is an invalid value and
should be treated as 'now' -->
<meta http-equiv="content-language" content="en"/>
<meta name="author" content="Cedrik LIME"/>
- <meta name="copyright" content="copyright 2005-2014 the Apache Software
Foundation"/>
+ <meta name="copyright" content="copyright 2005-2015 the Apache Software
Foundation"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration for <%=
JspHelper.escapeXml(cn.getDisplayName()) %></title>
</head>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
