You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2009/12/07 03:23:16 UTC
svn commit: r887821 - /commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
Author: psteitz
Date: Mon Dec 7 02:23:10 2009
New Revision: 887821
URL: http://svn.apache.org/viewvc?rev=887821&view=rev
Log:
Modified (commons-build-generated) download page to include links to both 1.3 and 1.4 releases.
Modified:
commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
Modified: commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/download_dbcp.xml?rev=887821&r1=887820&r2=887821&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/xdocs/download_dbcp.xml (original)
+++ commons/proper/dbcp/trunk/xdocs/download_dbcp.xml Mon Dec 7 02:23:10 2009
@@ -18,28 +18,24 @@
<!--
+======================================================================+
|**** ****|
- |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
- |**** DO NOT EDIT DIRECTLY ****|
+ |**** THIS IS A MODIFIED VERSION OF THE FILE GENERATED ****|
+ |**** BY THE COMMONS BUILD PLUGIN. THE MODIFICATION ****|
+ |**** DISPLAYS DOWNLOAD LINKS FOR TWO RELEASE VERSIONS ****|
+ |**** (DBCP 1.3 and 1.4). ****|
|**** ****|
+======================================================================+
| TEMPLATE FILE: download-page-template.xml |
| commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+======================================================================+
| |
- | 1) Re-generate using: mvn commons:download-page |
+ | To regenerate this file: |
| |
- | 2) Set the following properties in the component's pom: |
- | - commons.componentid (required, alphabetic, lower case) |
- | - commons.release.version (required) |
- | - commons.binary.suffix (optional) |
- | (defaults to "-bin", set to "" for pre-maven2 releases) |
+ | 0) Make sure commons.release.version is set correcly in pom.xml. |
| |
- | 3) Example Properties |
+ | 1) Execute "mvn commons:download-page" |
+ | | |
+ | 2) Add the sections marked "ADDITIONAL RELEASE" |
| |
- | <properties> |
- | <commons.componentid>math</commons.componentid> |
- | <commons.release.version>1.2</commons.release.version> |
- | </properties> |
| |
+======================================================================+
-->
@@ -99,20 +95,23 @@
<p>
<div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
+ <!-- ADDITIONAL RELEASE -->
+ <subsection name="Latest Release for JDBC 4 (JDK 1.6)">
+ <!-- END ADDITIONAL RELEASE -->
<ul class="downloads">
<li class="group"><div class="links"><span class="label">Binary</span></div>
<ul>
- <li class="download"><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.2.2.tar.gz">1.2.2.tar.gz</a>
+ <li class="download"><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.4.tar.gz">1.4.tar.gz</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.2.tar.gz.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.2.tar.gz.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4.tar.gz.asc">pgp</a>]</span>
</li>
</ul>
</li>
- <li class="download"><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.2.2.zip">1.2.2.zip</a>
+ <li class="download"><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.4.zip">1.4.zip</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.2.zip.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.2.2.zip.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.4.zip.asc">pgp</a>]</span>
</li>
</ul>
</li>
@@ -120,17 +119,17 @@
</li>
<li class="group"><div class="links"><span class="label">Source</span></div>
<ul>
- <li class="download"><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz">1.2.2.tar.gz</a>
+ <li class="download"><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz">1.4.tar.gz</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.tar.gz.asc">pgp</a>]</span>
</li>
</ul>
</li>
- <li class="download"><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.2.2-src.zip">1.2.2.zip</a>
+ <li class="download"><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.4-src.zip">1.4.zip</a>
<ul class="attributes">
- <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.zip.md5">md5</a>]</span>
- <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.zip.asc">pgp</a>]</span>
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.4-src.zip.asc">pgp</a>]</span>
</li>
</ul>
</li>
@@ -139,7 +138,54 @@
<li class="download"><a href="[preferred]/commons/dbcp/">browse download area</a></li>
<li><a href="http://archive.apache.org/dist/commons/dbcp/">archives...</a></li>
</ul>
+ <!-- ADDITIONAL RELEASE -->
+ </subsection>
+ <!-- END ADDITIONAL RELEASE -->
</p>
+ <!-- ADDITIONAL RELEASE -->
+ <p>
+ <subsection name="Latest Release for JDBC 3 (JDK 1.4-1.5)">
+ <ul class="downloads">
+ <li class="group"><div class="links"><span class="label">Binary</span></div>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3.tar.gz">1.3.tar.gz</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3.tar.gz.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/dbcp/binaries/commons-dbcp-1.3.zip">1.3.zip</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-1.3.zip.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li class="group"><div class="links"><span class="label">Source</span></div>
+ <ul>
+ <li class="download"><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.3-src.tar.gz">1.3.tar.gz</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.tar.gz.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.tar.gz.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ <li class="download"><a href="[preferred]/commons/dbcp/source/commons-dbcp-1.3-src.zip">1.3.zip</a>
+ <ul class="attributes">
+ <li><span class="md5">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.zip.md5">md5</a>]</span>
+ <span class="pgp">[<a href="http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.3-src.zip.asc">pgp</a>]</span>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </subsection>
+ </p>
+ <!-- END ADDITIONAL RELEASE -->
</section>
</body>
</document>
Re: svn commit: r887821 - /commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
Posted by Niall Pemberton <ni...@gmail.com>.
On Mon, Dec 7, 2009 at 3:36 AM, Phil Steitz <ph...@gmail.com> wrote:
> Niall Pemberton wrote:
>> Phil,
>>
>> It might be easier (maintenance-wise) to generate two separate pages -
>> one for each version. i.e. set the commons.release.version to "1.3",
>> generate the download_dbcp.xml and then rename it to something like
>> download_dbcp_13.xml then change the commons.release.version to "1.4"
>> and re-generate the download_dbcp.xml.
>
> Thanks, Niall. The problem that I am trying to solve - unless
> others object to this - is to have *both 1.3 and 1.4* appear on a
> single download page. I see the two releases as really both "latest
> release - just for different platforms." I felt bad about hacking
> the generated file, but unless we want commons.release.version to
> turn into a list, I don't see a clean way to fix this.
There isn't a great way to do it in ant - need XSLT or jelly or some
such thing. Having said that I have changed commons-build-plugin so
that you can specify a second release version:
https://issues.apache.org/jira/browse/COMMONSSITE-48
Example of page generated for DBCP is here:
http://people.apache.org/~niallp/dbcp/download_dbcp.html
And the changes required in DBCP pom.xml:
http://issues.apache.org/jira/secure/attachment/12427266/build-plugin-dbcp.patch
Not great, but it works. Too late for this iteration of DBCP (would
need a commons-build-plugin and commons-parent release).
Niall
> Phil
>>
>> Up to you, just a suggestion
>>
>> Niall
>>
>> On Mon, Dec 7, 2009 at 2:23 AM, <ps...@apache.org> wrote:
>>> Author: psteitz
>>> Date: Mon Dec 7 02:23:10 2009
>>> New Revision: 887821
>>>
>>> URL: http://svn.apache.org/viewvc?rev=887821&view=rev
>>> Log:
>>> Modified (commons-build-generated) download page to include links to both 1.3 and 1.4 releases.
>>>
>>> Modified:
>>> commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
>>>
>>> Modified: commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
>>> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/download_dbcp.xml?rev=887821&r1=887820&r2=887821&view=diff
>>> ==============================================================================
>>> --- commons/proper/dbcp/trunk/xdocs/download_dbcp.xml (original)
>>> +++ commons/proper/dbcp/trunk/xdocs/download_dbcp.xml Mon Dec 7 02:23:10 2009
>>> @@ -18,28 +18,24 @@
>>> <!--
>>> +======================================================================+
>>> |**** ****|
>>> - |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
>>> - |**** DO NOT EDIT DIRECTLY ****|
>>> + |**** THIS IS A MODIFIED VERSION OF THE FILE GENERATED ****|
>>> + |**** BY THE COMMONS BUILD PLUGIN. THE MODIFICATION ****|
>>> + |**** DISPLAYS DOWNLOAD LINKS FOR TWO RELEASE VERSIONS ****|
>>> + |**** (DBCP 1.3 and 1.4). ****|
>>> |**** ****|
>>> +======================================================================+
>>> | TEMPLATE FILE: download-page-template.xml |
>>> | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
>>> +======================================================================+
>>> | |
>>> - | 1) Re-generate using: mvn commons:download-page |
>>> + | To regenerate this file: |
>>> | |
>>> - | 2) Set the following properties in the component's pom: |
>>> - | - commons.componentid (required, alphabetic, lower case) |
>>> - | - commons.release.version (required) |
>>> - | - commons.binary.suffix (optional) |
>>> - | (defaults to "-bin", set to "" for pre-maven2 releases) |
>>> + | 0) Make sure commons.release.version is set correcly in pom.xml. |
>>> | |
>>> - | 3) Example Properties |
>>> + | 1) Execute "mvn commons:download-page" |
>>> + | | |
>>> + | 2) Add the sections marked "ADDITIONAL RELEASE" |
>>> | |
>>> - | <properties> |
>>> - | <commons.componentid>math</commons.componentid> |
>>> - | <commons.release.version>1.2</commons.release.version> |
>>> - | </properties> |
>>> | |
>>> +======================================================================+
>>> -->
>>> @@ -99,20 +95,23 @@
>>>
>>> <p>
>>> <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
>>> + <!-- ADDITIONAL RELEASE -->
>>> + <subsection name="Latest Release for JDBC 4 (JDK 1.6)">
>>> + <!-- END ADDITIONAL RELEASE -->
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r887821 - /commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
Posted by Phil Steitz <ph...@gmail.com>.
Niall Pemberton wrote:
> Phil,
>
> It might be easier (maintenance-wise) to generate two separate pages -
> one for each version. i.e. set the commons.release.version to "1.3",
> generate the download_dbcp.xml and then rename it to something like
> download_dbcp_13.xml then change the commons.release.version to "1.4"
> and re-generate the download_dbcp.xml.
Thanks, Niall. The problem that I am trying to solve - unless
others object to this - is to have *both 1.3 and 1.4* appear on a
single download page. I see the two releases as really both "latest
release - just for different platforms." I felt bad about hacking
the generated file, but unless we want commons.release.version to
turn into a list, I don't see a clean way to fix this.
Phil
>
> Up to you, just a suggestion
>
> Niall
>
> On Mon, Dec 7, 2009 at 2:23 AM, <ps...@apache.org> wrote:
>> Author: psteitz
>> Date: Mon Dec 7 02:23:10 2009
>> New Revision: 887821
>>
>> URL: http://svn.apache.org/viewvc?rev=887821&view=rev
>> Log:
>> Modified (commons-build-generated) download page to include links to both 1.3 and 1.4 releases.
>>
>> Modified:
>> commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
>>
>> Modified: commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
>> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/download_dbcp.xml?rev=887821&r1=887820&r2=887821&view=diff
>> ==============================================================================
>> --- commons/proper/dbcp/trunk/xdocs/download_dbcp.xml (original)
>> +++ commons/proper/dbcp/trunk/xdocs/download_dbcp.xml Mon Dec 7 02:23:10 2009
>> @@ -18,28 +18,24 @@
>> <!--
>> +======================================================================+
>> |**** ****|
>> - |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
>> - |**** DO NOT EDIT DIRECTLY ****|
>> + |**** THIS IS A MODIFIED VERSION OF THE FILE GENERATED ****|
>> + |**** BY THE COMMONS BUILD PLUGIN. THE MODIFICATION ****|
>> + |**** DISPLAYS DOWNLOAD LINKS FOR TWO RELEASE VERSIONS ****|
>> + |**** (DBCP 1.3 and 1.4). ****|
>> |**** ****|
>> +======================================================================+
>> | TEMPLATE FILE: download-page-template.xml |
>> | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
>> +======================================================================+
>> | |
>> - | 1) Re-generate using: mvn commons:download-page |
>> + | To regenerate this file: |
>> | |
>> - | 2) Set the following properties in the component's pom: |
>> - | - commons.componentid (required, alphabetic, lower case) |
>> - | - commons.release.version (required) |
>> - | - commons.binary.suffix (optional) |
>> - | (defaults to "-bin", set to "" for pre-maven2 releases) |
>> + | 0) Make sure commons.release.version is set correcly in pom.xml. |
>> | |
>> - | 3) Example Properties |
>> + | 1) Execute "mvn commons:download-page" |
>> + | | |
>> + | 2) Add the sections marked "ADDITIONAL RELEASE" |
>> | |
>> - | <properties> |
>> - | <commons.componentid>math</commons.componentid> |
>> - | <commons.release.version>1.2</commons.release.version> |
>> - | </properties> |
>> | |
>> +======================================================================+
>> -->
>> @@ -99,20 +95,23 @@
>>
>> <p>
>> <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
>> + <!-- ADDITIONAL RELEASE -->
>> + <subsection name="Latest Release for JDBC 4 (JDK 1.6)">
>> + <!-- END ADDITIONAL RELEASE -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r887821 - /commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
Posted by Niall Pemberton <ni...@gmail.com>.
Phil,
It might be easier (maintenance-wise) to generate two separate pages -
one for each version. i.e. set the commons.release.version to "1.3",
generate the download_dbcp.xml and then rename it to something like
download_dbcp_13.xml then change the commons.release.version to "1.4"
and re-generate the download_dbcp.xml.
Up to you, just a suggestion
Niall
On Mon, Dec 7, 2009 at 2:23 AM, <ps...@apache.org> wrote:
> Author: psteitz
> Date: Mon Dec 7 02:23:10 2009
> New Revision: 887821
>
> URL: http://svn.apache.org/viewvc?rev=887821&view=rev
> Log:
> Modified (commons-build-generated) download page to include links to both 1.3 and 1.4 releases.
>
> Modified:
> commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
>
> Modified: commons/proper/dbcp/trunk/xdocs/download_dbcp.xml
> URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/download_dbcp.xml?rev=887821&r1=887820&r2=887821&view=diff
> ==============================================================================
> --- commons/proper/dbcp/trunk/xdocs/download_dbcp.xml (original)
> +++ commons/proper/dbcp/trunk/xdocs/download_dbcp.xml Mon Dec 7 02:23:10 2009
> @@ -18,28 +18,24 @@
> <!--
> +======================================================================+
> |**** ****|
> - |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
> - |**** DO NOT EDIT DIRECTLY ****|
> + |**** THIS IS A MODIFIED VERSION OF THE FILE GENERATED ****|
> + |**** BY THE COMMONS BUILD PLUGIN. THE MODIFICATION ****|
> + |**** DISPLAYS DOWNLOAD LINKS FOR TWO RELEASE VERSIONS ****|
> + |**** (DBCP 1.3 and 1.4). ****|
> |**** ****|
> +======================================================================+
> | TEMPLATE FILE: download-page-template.xml |
> | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
> +======================================================================+
> | |
> - | 1) Re-generate using: mvn commons:download-page |
> + | To regenerate this file: |
> | |
> - | 2) Set the following properties in the component's pom: |
> - | - commons.componentid (required, alphabetic, lower case) |
> - | - commons.release.version (required) |
> - | - commons.binary.suffix (optional) |
> - | (defaults to "-bin", set to "" for pre-maven2 releases) |
> + | 0) Make sure commons.release.version is set correcly in pom.xml. |
> | |
> - | 3) Example Properties |
> + | 1) Execute "mvn commons:download-page" |
> + | | |
> + | 2) Add the sections marked "ADDITIONAL RELEASE" |
> | |
> - | <properties> |
> - | <commons.componentid>math</commons.componentid> |
> - | <commons.release.version>1.2</commons.release.version> |
> - | </properties> |
> | |
> +======================================================================+
> -->
> @@ -99,20 +95,23 @@
>
> <p>
> <div class="links"><span class="link"><a href="http://www.apache.org/dist/commons/KEYS">KEYS</a></span></div>
> + <!-- ADDITIONAL RELEASE -->
> + <subsection name="Latest Release for JDBC 4 (JDK 1.6)">
> + <!-- END ADDITIONAL RELEASE -->