Author: rjung
Date: Thu May 17 02:12:40 2007
New Revision: 538845
URL: http://svn.apache.org/viewvc?view=rev&rev=538845
Log:
Port post 1.2.22 changes to 1.2.23 branch:
- version bump
- docs changes about 1.2.22 release
(revs 529275, 530028, 530038, 538842)
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/native/STATUS.txt
tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_version.h
tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/isapi_redirect.rc
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/index.xml
tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/news/20070301.xml
Modified: tomcat/connectors/branches/other/JK_1_2_23/jk/native/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/native/STATUS.txt?view=diff&rev=538845&r1=538844&r2=538845
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/native/STATUS.txt (original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/native/STATUS.txt Thu May 17
02:12:40 2007
@@ -3,7 +3,8 @@
Release:
- 1.2.22 : in development
+ 1.2.23 : in development
+ 1.2.22 : released April 17, 2007
1.2.21 : released March 1, 2007
1.2.20 : released December 10, 2006
1.2.19 : released September 17, 2006
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_version.h?view=diff&rev=538845&r1=538844&r2=538845
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_version.h
(original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/native/common/jk_version.h
Thu May 17 02:12:40 2007
@@ -26,14 +26,14 @@
/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
-#define JK_VERFIX 22
-#define JK_VERSTRING "1.2.22"
+#define JK_VERFIX 23
+#define JK_VERSTRING "1.2.23"
/* Beta number */
#define JK_VERBETA 0
#define JK_BETASTRING "0"
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
#define JK_VERRC 0
#define JK_RCSTRING "0"
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/installer/isapi-redirector-win32-msi.ism
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/installer/isapi-redirector-win32-msi.ism?view=diff&rev=538845&r1=538844&r2=538845
==============================================================================
---
tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/installer/isapi-redirector-win32-msi.ism
(original)
+++
tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/installer/isapi-redirector-win32-msi.ism
Thu May 17 02:12:40 2007
@@ -3409,7 +3409,7 @@
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>Tomcat Isapi
Redirector</td><td/></row>
- <row><td>ProductVersion</td><td>1.2.22</td><td/></row>
+ <row><td>ProductVersion</td><td>1.2.23</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
Modified:
tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/isapi_redirect.rc
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/isapi_redirect.rc?view=diff&rev=538845&r1=538844&r2=538845
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/isapi_redirect.rc
(original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/native/iis/isapi_redirect.rc
Thu May 17 02:12:40 2007
@@ -14,13 +14,13 @@
"specific language governing permissions and " \
"limitations under the License."
-#define JK_VERSION_STR "1.2.22"
+#define JK_VERSION_STR "1.2.23"
#define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
1 VERSIONINFO
- FILEVERSION 1,2,22,0
- PRODUCTVERSION 1,2,22,0
+ FILEVERSION 1,2,23,0
+ PRODUCTVERSION 1,2,23,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x01L
Modified: tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/index.xml?view=diff&rev=538845&r1=538844&r2=538845
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/index.xml (original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/index.xml Thu May 17
02:12:40 2007
@@ -29,6 +29,16 @@
<section name="Headlines">
<br />
<ul>
+<li><a href="news/20070301.html#20070417.1">17 April 2007 - <b>JK-1.2.22
released</b></a>
+<p>The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.22 Stable.
+</p>
+<p>Download the <a
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.22/tomcat-connectors-1.2.22-src.tar.gz";>JK
1.2.22 release sources</a>
+ | <a
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.22/tomcat-connectors-1.2.22-src.tar.gz.asc";>PGP
signature</a>
+</p>
+<p>Download the <a
href="http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries</a>
for selected platforms.
+</p>
+</li>
<li><a href="news/20070301.html#20070301.1">1 March 2007 - <b>JK-1.2.21
released</b></a>
<p>The Apache Tomcat team is proud to announce the immediate availability
of Tomcat Connectors 1.2.21 Stable.
Modified: tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/news/20070301.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/news/20070301.xml?view=diff&rev=538845&r1=538844&r2=538845
==============================================================================
--- tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/news/20070301.xml
(original)
+++ tomcat/connectors/branches/other/JK_1_2_23/jk/xdocs/news/20070301.xml Thu
May 17 02:12:40 2007
@@ -31,6 +31,20 @@
Bug Report. When entering bug select <b>Native:JK</b> Component.
</p>
<hr size="1" noshade="noshade" />
+<a name="20070417.1">
+<h3>17 April - JK-1.2.22 released</h3>
+</a>
+<p>The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.22. This is a stable release adding new features
+and a few bug fixes to version 1.2.22.
+</p><p>
+ Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a> for a
full list of changes.
+</p>
+<p>If you find any bugs while using this release, please fill in the
+<a
href="http://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%205";>Bugzilla</a>
+Bug Report. When entering bug select <b>Native:JK</b> Component.
+</p>
+<hr size="1" noshade="noshade" />
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
