You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Niall Pemberton <ni...@gmail.com> on 2009/12/07 03:36:40 UTC

Re: svn commit: r887821 - /commons/proper/dbcp/trunk/xdocs/download_dbcp.xml

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 -->

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