Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A18CF10DC3 for ; Fri, 3 Jan 2014 17:47:38 +0000 (UTC) Received: (qmail 51322 invoked by uid 500); 3 Jan 2014 17:43:50 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 50784 invoked by uid 500); 3 Jan 2014 17:42:56 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 50454 invoked by uid 99); 3 Jan 2014 17:42:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2014 17:42:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2014 17:42:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B3D7B238889B for ; Fri, 3 Jan 2014 17:42:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Fri, 03 Jan 2014 17:42:08 -0000 To: dev@tomcat.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140103174208.B3D7B238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 = "
\n" + "
\n" + - " Copyright © 1999-2013, Apache Software Foundation" + + " Copyright © 1999-2014, Apache Software Foundation" + "
\n" + "\n" + "\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 = "
\n" + "
\n" + - " Copyright © 1999-2013, Apache Software Foundation" + + " Copyright © 1999-2014, Apache Software Foundation" + "
\n" + "\n" + "\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%;} PAGE FOOTER
- Copyright © 1999-2013, Apache Software Foundation + Copyright © 1999-2014, Apache Software Foundation
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 @@ - + Sessions Administration: details for <%= currentSessionId %> 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 @@ - + Sessions Administration for <%= JspHelper.escapeXml(cn.getDisplayName()) %> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org