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/03/09 09:26:34 UTC
[tomcat-connectors] branch master updated (9750da3 -> 8872f94)
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 9750da3 No longer necessary to generate printer versions of the docs
new b33da2d Add release date
new d37352d Drop comments sections. comments.a.o no longer exists.
new 8872f94 Fix footer dates and add version finfo
The 3 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:
HOWTO-RELEASE.txt | 1 +
xdocs/build.xml | 42 +++++++++++++++++++++++++--
xdocs/news/20200201.xml | 2 +-
xdocs/tomcat-docs.xsl | 75 -------------------------------------------------
4 files changed, 41 insertions(+), 79 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 01/03: Add release date
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 b33da2de2e5c54dee730ea67630943e22f322578
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 9 08:56:52 2020 +0000
Add release date
---
xdocs/news/20200201.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xdocs/news/20200201.xml b/xdocs/news/20200201.xml
index 3f785b5..0b37b95 100644
--- a/xdocs/news/20200201.xml
+++ b/xdocs/news/20200201.xml
@@ -31,7 +31,7 @@
<section name="2020 News & Status">
-<subsection name="February - JK-1.2.48 released">
+<subsection name="6 March - JK-1.2.48 released">
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Connectors 1.2.48. This is a maintenance release.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 03/03: Fix footer dates and add version finfo
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 8872f94fb5cd4fd65a6323dddfd0883e0c350eae
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 9 09:26:14 2020 +0000
Fix footer dates and add version finfo
---
HOWTO-RELEASE.txt | 1 +
xdocs/build.xml | 42 +++++++++++++++++++++++++++++++++++++++---
xdocs/tomcat-docs.xsl | 2 --
3 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 4c1bfd9..fcb8413 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -45,6 +45,7 @@ had to be updated:
native/iis/README
native/netscape/README
+xdocs/build.xml
xdocs/index.xml
xdocs/news/<THISYEAR0101>.xml
tools/dist/binaries/windows/README.html
diff --git a/xdocs/build.xml b/xdocs/build.xml
index e8bf338..d3fb74e 100644
--- a/xdocs/build.xml
+++ b/xdocs/build.xml
@@ -28,10 +28,18 @@
<property file="${user.home}/build.properties"/>
<property name="build.compiler" value="modern"/>
- <property name="build.dir" value="../build"/>
- <property name="dist.dir" value="../dist"/>
- <property name="dist.name" value="docs"/>
+ <property name="build.dir" value="../build"/>
+ <property name="dist.dir" value="../dist"/>
+ <property name="dist.name" value="docs"/>
+ <property name="version" value="1.2.48"/>
+
+ <tstamp>
+ <format property="year" pattern="yyyy" locale="en" timezone="UTC"/>
+ <format property="today" pattern="MMM d yyyy" locale="en" timezone="UTC"/>
+ <format property="today-iso-8601" pattern="yyyy-MM-dd" locale="en" timezone="UTC"/>
+ <format property="tstamp" pattern="HH:mm:ss" locale="en" timezone="UTC"/>
+ </tstamp>
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
@@ -71,6 +79,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="reference/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- Common Howto -->
@@ -82,6 +94,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="common_howto/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- Webserver Howto -->
@@ -93,6 +109,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="webserver_howto/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- AJP Protocol Reference -->
@@ -104,6 +124,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="ajp/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- Miscellaneous Documentation -->
@@ -115,6 +139,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="miscellaneous/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
<!-- News -->
@@ -126,6 +154,10 @@
includes="*.xml">
<param name="relative-path" expression=".."/>
<param name="subdir" expression="news/"/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
</target>
@@ -142,6 +174,10 @@
excludes="build.xml project.xml empty.xml"
includes="*.xml">
<param name="relative-path" expression="."/>
+ <param name="version" expression="${version}"/>
+ <param name="build-date" expression="${today}"/>
+ <param name="build-date-iso-8601" expression="${today-iso-8601}"/>
+ <param name="year" expression="${year}"/>
</xslt>
</target>
diff --git a/xdocs/tomcat-docs.xsl b/xdocs/tomcat-docs.xsl
index 828178c..8f517de 100644
--- a/xdocs/tomcat-docs.xsl
+++ b/xdocs/tomcat-docs.xsl
@@ -113,12 +113,10 @@
<a href="https://www.apache.org/" target="_blank"><img src="{$src}" alt="The Apache Software Foundation" style="width: 266px; height: 83px;"/></a>
</div>
<h1><xsl:value-of select="$project/title"/></h1>
- <!-- version and build-date aren't available, so we can't display them
<div class="versionInfo">
Version <xsl:value-of select="$version"/>,
<time datetime="{$build-date-iso-8601}"><xsl:value-of select="$build-date"/></time>
</div>
- -->
<div style="height: 1px;"/>
<div style="clear: left;"/>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-connectors] 02/03: Drop comments sections. comments.a.o no
longer exists.
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 d37352d7cf68a187e6c7f5c9c14b788a91126db9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 9 09:25:29 2020 +0000
Drop comments sections. comments.a.o no longer exists.
---
xdocs/tomcat-docs.xsl | 73 ---------------------------------------------------
1 file changed, 73 deletions(-)
diff --git a/xdocs/tomcat-docs.xsl b/xdocs/tomcat-docs.xsl
index 968e18a..828178c 100644
--- a/xdocs/tomcat-docs.xsl
+++ b/xdocs/tomcat-docs.xsl
@@ -52,7 +52,6 @@
<xsl:param name="filename" select="'-'"/>
<!-- Defined variables (non-overrideable) -->
- <xsl:variable name="commentslink"><xsl:value-of select="$relative-path"/>/comments.html</xsl:variable>
<xsl:variable name="project-xml-filename"><xsl:value-of select="$subdir"/>project.xml</xsl:variable>
<xsl:variable name="project"
select="document($project-xml-filename)/project"/>
@@ -89,52 +88,6 @@
<meta name="author" content="{$name}"/>
</xsl:for-each>
- <!-- Script for ASF Comments System. -->
- <!--
- Use data-* attributes for retrieval of XSLT-generated data
- in JavaScript.
- Use this approach rather than directly inserting text
- in a JS string literal as that would cause
- problems when the string contains special characters
- like ", ', \n etc.
- -->
- <xsl:variable name="comments-identifier">
- <xsl:value-of select="$sitedir"/><xsl:value-of select="$subdir"/><xsl:value-of select="substring($filename,1,string-length($filename)-4)"/>
- </xsl:variable>
- <xsl:if test="not(properties/no-comments)">
- <script type="application/javascript"
- data-comments-identifier="{$comments-identifier}"><![CDATA[
- "use strict"; // Enable strict mode
-
- (function() {
- var thisScript = document.currentScript;
- if (!thisScript) { // Workaround for IE <= 11
- var scripts = document.getElementsByTagName("script");
- thisScript = scripts[scripts.length - 1];
- }
- document.addEventListener("DOMContentLoaded", (function() {
- var commentsDiv = document.getElementById("comments_thread");
- var commentsShortname = "tomcat";
- var commentsIdentifier = "https://tomcat.apache.org/" +
- thisScript.getAttribute("data-comments-identifier") + ".html";
-
- (function(w, d) {
- if (w.location.hostname.toLowerCase() == "tomcat.apache.org") {
- var s = d.createElement("script");
- s.type = "application/javascript";
- s.async = true;
- s.src = "https://comments.apache.org/show_comments.lua?site=" +
- encodeURIComponent(commentsShortname) +
- "&page=" + encodeURIComponent(commentsIdentifier);
- d.head.appendChild(s);
- } else {
- commentsDiv.appendChild(d.createTextNode("Comments are disabled for this page at the moment."));
- }
- })(window, document);
- }), false);
- })();
- ]]></script>
- </xsl:if>
</head>
<body>
@@ -187,32 +140,6 @@
<!-- Main Part -->
<h2><xsl:value-of select="properties/title"/></h2>
<xsl:apply-templates select="body/section"/>
-
- <!-- Comments Section -->
- <xsl:if test="not(properties/no-comments)">
- <div class="noprint">
- <h3 id="comments_section">
- Comments
- </h3>
-
- <div class="text">
- <p class="notice">
- <strong>Notice:</strong> This comments section collects your suggestions
- on improving documentation for Apache Tomcat.<br/><br/>
- If you have trouble and need help, read
- <a href="https://tomcat.apache.org/findhelp.html">Find Help</a> page
- and ask your question on the tomcat-users
- <a href="https://tomcat.apache.org/lists.html">mailing list</a>.
- Do not ask such questions here. This is not a Q&A section.<br/><br/>
- The Apache Comments System is explained <a href="{$commentslink}">here</a>.
- Comments may be removed by our moderators if they are either
- implemented or considered invalid/off-topic.
- </p>
- <div id="comments_thread"/>
- </div>
- </div>
- </xsl:if>
-
</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org