tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1555167 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/tribes/ webapps/manager/WEB-INF/jsp/
Date Fri, 03 Jan 2014 17:54:53 GMT
Author: rjung
Date: Fri Jan  3 17:54:53 2014
New Revision: 1555167

URL: http://svn.apache.org/r1555167
Log:
Happy new 2014!

Backport of r1555163 from trunk resp. r1555165 from tc7
plus tomcat-docs.xsl in tribes docs.

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/NOTICE
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
    tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl
    tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
    tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1555163

Modified: tomcat/tc6.0.x/trunk/NOTICE
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/NOTICE (original)
+++ tomcat/tc6.0.x/trunk/NOTICE Fri Jan  3 17:54:53 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/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/Constants.java Fri Jan  3 17:54:53
2014
@@ -182,7 +182,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 &copy; 1999-2013, Apache Software Foundation</em>"
+
+        " <em>Copyright &copy; 1999-2014, Apache Software Foundation</em>"
+
         "</font></center>\n" +
         "\n" +
         "</body>\n" +

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Fri Jan
 3 17:54:53 2014
@@ -676,7 +676,7 @@ public final class HTMLManagerServlet ex
      * @see javax.servlet.Servlet#getServletInfo()
      */
     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/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java Fri Jan  3 17:54:53
2014
@@ -186,7 +186,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 &copy; 1999-2013, Apache Software Foundation</em>"
+
+        " <em>Copyright &copy; 1999-2014, Apache Software Foundation</em>"
+
         "</font></center>\n" +
         "\n" +
         "</body>\n" +

Modified: tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl Fri Jan  3 17:54:53 2014
@@ -182,7 +182,7 @@
       <xsl:comment>PAGE FOOTER</xsl:comment>
       <tr><td colspan="2">
         <div align="center"><font color="{$body-link}" size="-1"><em>
-        Copyright &#169; 1999-2013, Apache Software Foundation
+        Copyright &#169; 1999-2014, Apache Software Foundation
         </em></font></div>
       </td></tr>
 

Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionDetail.jsp Fri Jan  3 17:54:53
2014
@@ -42,7 +42,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/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp?rev=1555167&r1=1555166&r2=1555167&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/jsp/sessionsList.jsp Fri Jan  3 17:54:53
2014
@@ -38,7 +38,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(path) %></title>
 </head>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message