You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2014/01/03 18:42:08 UTC
svn commit: r1555165 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/
modules/jdbc-pool/ modules/jdbc-pool/doc/ webapps/manager/WEB-INF/jsp/
Author: rjung
Date: Fri Jan 3 17:42:07 2014
New Revision: 1555165
URL: http://svn.apache.org/r1555165
Log:
Happy new year 2014.
Backport of r1555163 from trunk.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/NOTICE
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE
tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1555163
Modified: tomcat/tc7.0.x/trunk/NOTICE
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/NOTICE?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/NOTICE (original)
+++ tomcat/tc7.0.x/trunk/NOTICE Fri Jan 3 17:42:07 2014
@@ -1,5 +1,5 @@
Apache Tomcat
-Copyright 1999-2013 The Apache Software Foundation
+Copyright 1999-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri Jan 3 17:42:07 2014
@@ -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-2013, Apache Software Foundation</em>" +
+ " <em>Copyright © 1999-2014, Apache Software Foundation</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Jan 3 17:42:07 2014
@@ -776,7 +776,7 @@ public final class HTMLManagerServlet ex
*/
@Override
public String getServletInfo() {
- return "HTMLManagerServlet, Copyright (c) 1999-2013, The Apache Software Foundation";
+ return "HTMLManagerServlet, Copyright (c) 1999-2014, The Apache Software Foundation";
}
/**
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java Fri Jan 3 17:42:07 2014
@@ -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-2013, Apache Software Foundation</em>" +
+ " <em>Copyright © 1999-2014, Apache Software Foundation</em>" +
"</font></center>\n" +
"\n" +
"</body>\n" +
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/NOTICE Fri Jan 3 17:42:07 2014
@@ -1,5 +1,5 @@
Apache Tomcat JDBC Pool
-Copyright 2008-2013 The Apache Software Foundation
+Copyright 2008-2014 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl (original)
+++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/doc/package.xsl Fri Jan 3 17:42:07 2014
@@ -150,7 +150,7 @@ td#mainBody {width: 100%;}
<xsl:comment>PAGE FOOTER</xsl:comment>
<tr><td colspan="2">
<div align="center"><font color="{$body-link}" size="-1"><em>
- Copyright © 1999-2013, Apache Software Foundation
+ Copyright © 1999-2014, Apache Software Foundation
</em></font></div>
</td></tr>
Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Fri Jan 3 17:42:07 2014
@@ -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-2013 the Apache Software Foundation"/>
+ <meta name="copyright" content="copyright 2005-2014 the Apache Software Foundation"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
<title>Sessions Administration: details for <%= currentSessionId %></title>
</head>
Modified: tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1555165&r1=1555164&r2=1555165&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original)
+++ tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Fri Jan 3 17:42:07 2014
@@ -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-2013 the Apache Software Foundation"/>
+ <meta name="copyright" content="copyright 2005-2014 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org