You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/19 17:36:45 UTC

[tomcat-connectors] branch master updated (4660948 -> e7f53e8)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git.


    from 4660948  Update changelog
     new 0e3c5aa  Remove some debug logging
     new e7f53e8  Update copyright dates. Add 2020 news to menu.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 jkstatus/build.xml                | 2 +-
 native/common/jk_status.c         | 2 +-
 native/iis/jk_isapi_plugin.c      | 2 +-
 tools/jkrelease.sh                | 2 --
 xdocs/news/20200201.xml           | 4 ++--
 xdocs/news/project.xml            | 1 +
 xdocs/project.xml                 | 1 +
 xdocs/reference/project.xml       | 1 +
 xdocs/webserver_howto/project.xml | 1 +
 9 files changed, 9 insertions(+), 7 deletions(-)


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


[tomcat-connectors] 02/02: Update copyright dates. Add 2020 news to menu.

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git

commit e7f53e8db57c55ebdd6baa7647e510d2ac9b4656
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 17:35:13 2020 +0000

    Update copyright dates. Add 2020 news to menu.
---
 jkstatus/build.xml                | 2 +-
 native/common/jk_status.c         | 2 +-
 native/iis/jk_isapi_plugin.c      | 2 +-
 xdocs/news/20200201.xml           | 4 ++--
 xdocs/news/project.xml            | 1 +
 xdocs/project.xml                 | 1 +
 xdocs/reference/project.xml       | 1 +
 xdocs/webserver_howto/project.xml | 1 +
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jkstatus/build.xml b/jkstatus/build.xml
index 717a605..cf1699a 100644
--- a/jkstatus/build.xml
+++ b/jkstatus/build.xml
@@ -120,7 +120,7 @@
       version="true"
       windowtitle="Jk Status Internal API Documentation"
       doctitle="Jk Status API"
-      bottom="Copyright &amp;#169; 2000-2019 Apache Software Foundation.  All Rights Reserved."
+      bottom="Copyright &amp;#169; 2000-2020 Apache Software Foundation.  All Rights Reserved."
     />
   </target>
 
diff --git a/native/common/jk_status.c b/native/common/jk_status.c
index dbdc20d..0ee9bbe 100644
--- a/native/common/jk_status.c
+++ b/native/common/jk_status.c
@@ -260,7 +260,7 @@
                                            "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">" \
                                            "<head><title>JK Status Manager</title>"
 
-#define JK_STATUS_COPYRIGHT                "Copyright &#169; 1999-2019, The Apache Software Foundation<br />" \
+#define JK_STATUS_COPYRIGHT                "Copyright &#169; 1999-2020, The Apache Software Foundation<br />" \
                                            "Licensed under the <a href=\"http://www.apache.org/licenses/LICENSE-2.0\">" \
                                            "Apache License, Version 2.0</a>."
 
diff --git a/native/iis/jk_isapi_plugin.c b/native/iis/jk_isapi_plugin.c
index 6b6b9fd..b071f32 100644
--- a/native/iis/jk_isapi_plugin.c
+++ b/native/iis/jk_isapi_plugin.c
@@ -212,7 +212,7 @@ char HTML_ERROR_TAIL[] =        "<P>\n<BR/>&nbsp;<BR/>&nbsp;<BR/>&nbsp;<BR/>&nbs
                                 "<BR/>&nbsp;\n"
                                 "<HR/>\n"
                                 "<P id=\"footer\">\n"
-                                "Copyright &copy; 1999-2019 Apache Software Foundation<BR/>\n"
+                                "Copyright &copy; 1999-2020 Apache Software Foundation<BR/>\n"
                                 "All Rights Reserved\n"
                                 "</P>\n</BODY>\n</HTML>\n";
 
diff --git a/xdocs/news/20200201.xml b/xdocs/news/20200201.xml
index 4b46745..894d263 100644
--- a/xdocs/news/20200201.xml
+++ b/xdocs/news/20200201.xml
@@ -18,13 +18,13 @@
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
-<document url="20180301.html">
+<document url="20200201.html">
 
   &project;
 
   <properties>
     <author email="dev.AT.tomcat.DOT.apache.DOT.org">Apache Tomcat Connectors Project</author>
-    <title>2018 News &amp; Status</title>
+    <title>2020 News &amp; Status</title>
   </properties>
 
 <body>
diff --git a/xdocs/news/project.xml b/xdocs/news/project.xml
index a801fab..4603190 100644
--- a/xdocs/news/project.xml
+++ b/xdocs/news/project.xml
@@ -67,6 +67,7 @@
     </menu>
 
     <menu name="News">
+        <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
         <item name="2015"                       href="../news/20150101.html"/>
diff --git a/xdocs/project.xml b/xdocs/project.xml
index a3c1a82..603fec0 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -67,6 +67,7 @@
     </menu>
 
     <menu name="News">
+        <item name="2020"                       href="news/20200201.html"/>
         <item name="2018"                       href="news/20180301.html"/>
         <item name="2016"                       href="news/20160901.html"/>
         <item name="2015"                       href="news/20150101.html"/>
diff --git a/xdocs/reference/project.xml b/xdocs/reference/project.xml
index 60a867b..34aa9f1 100644
--- a/xdocs/reference/project.xml
+++ b/xdocs/reference/project.xml
@@ -67,6 +67,7 @@
     </menu>
 
     <menu name="News">
+        <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20150901.html"/>
         <item name="2015"                       href="../news/20150101.html"/>
diff --git a/xdocs/webserver_howto/project.xml b/xdocs/webserver_howto/project.xml
index 4315bd0..0f17c42 100644
--- a/xdocs/webserver_howto/project.xml
+++ b/xdocs/webserver_howto/project.xml
@@ -67,6 +67,7 @@
     </menu>
 
     <menu name="News">
+        <item name="2020"                       href="../news/20200201.html"/>
         <item name="2018"                       href="../news/20180301.html"/>
         <item name="2016"                       href="../news/20160901.html"/>
         <item name="2015"                       href="../news/20150101.html"/>


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


[tomcat-connectors] 01/02: Remove some debug logging

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git

commit 0e3c5aab435eea82a84fe81ff4c71482a38b259a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Feb 19 16:59:58 2020 +0000

    Remove some debug logging
---
 tools/jkrelease.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/jkrelease.sh b/tools/jkrelease.sh
index fabd5a1..b75e117 100755
--- a/tools/jkrelease.sh
+++ b/tools/jkrelease.sh
@@ -257,8 +257,6 @@ else
     JK_TAG=`echo $version | sed -e 's#^#JK_#' -e 's#\.#_#g'`
     if [ $USE_GIT -eq 1 ]
     then
-        echo Tag:    [$tag]
-        echo JK_TAG: [$JK_TAG]
         if [ -n "$tag" ]
         then
             if [ -z "$force" ]


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