Author: niallp
Date: Fri Feb 19 02:43:21 2010
New Revision: 911679
URL: http://svn.apache.org/viewvc?rev=911679&view=rev
Log:
Change 2nd release parameter names and update site docs
Modified:
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
commons/proper/commons-build-plugin/trunk/src/site/resources/download-page-2release.jpg
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page-mojo.xml
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page.xml
Modified:
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-foot.xml
Fri Feb 19 02:43:21 2010
@@ -1,3 +1,4 @@
+ <section name="Archives">
<p>
Older releases can be obtained from the archives.
</p>
Modified:
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-head.xml
Fri Feb 19 02:43:21 2010
@@ -94,3 +94,4 @@
The <code>MD5</code> link downloads the checksum from the main site.
</p>
</subsection>
+ </section>
Modified:
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.build.xml
Fri Feb 19 02:43:21 2010
@@ -110,9 +110,9 @@
<echo level="${level}" message="project.name :
${project.name}" />
<echo level="${level}" message="commons.componentid :
${commons.componentid}" />
<echo level="${level}" message="commons.release.version:
${commons.release.version}" />
- <echo level="${level}" message="commons.release.version.2:
${commons.release.version.2}" />
<echo level="${level}" message="commons.release.desc :
${commons.release.desc}" />
- <echo level="${level}" message="commons.release.desc.2 :
${commons.release.desc.2}" />
+ <echo level="${level}" message="commons.release.2.version:
${commons.release.2.version}" />
+ <echo level="${level}" message="commons.release.2.desc :
${commons.release.2.desc}" />
<echo level="${level}" message="commons.binary.suffix :
${commons.binary.suffix}" />
<echo level="${level}" message="----- commons:download-page -
Parameters - END -----" />
@@ -171,7 +171,7 @@
</target>
- <target name="load-download-page-body-2" if="commons.release.version.2">
+ <target name="load-download-page-body-2" if="commons.release.2.version">
<echo level="info" message="*** loading download-page body(2)
file***" />
<!-- Load Body -->
@@ -179,11 +179,11 @@
<javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
<filterchain>
<replacetokens>
- <token key="VERSION"
value="${commons.release.version.2}"/>
- <token key="RELDESC"
value="${commons.release.desc.2}"/>
+ <token key="VERSION"
value="${commons.release.2.version}"/>
+ <token key="RELDESC"
value="${commons.release.2.desc}"/>
<token key="NAME" value="${project.name}"/>
<token key="ID" value="${commons.componentid}"/>
- <token key="FINAL_NAME"
value="${project.artifactId}-${commons.release.version.2}"/>
+ <token key="FINAL_NAME"
value="${project.artifactId}-${commons.release.2.version}"/>
<token key="BINARY-SUFFIX"
value="${commons.binary.suffix}"/>
</replacetokens>
</filterchain>
Modified:
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/main/scripts/generate-xdocs.mojos.xml
Fri Feb 19 02:43:21 2010
@@ -130,27 +130,27 @@
<parameter>
<name>commons.release.desc</name>
<property>commons.release.desc</property>
- <required>true</required>
+ <required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.desc}</defaultValue>
<type>java.lang.String</type>
<description>Release Title or Description.</description>
</parameter>
<parameter>
- <name>commons.release.version.2</name>
- <property>commons.release.version.2</property>
+ <name>commons.release.2.version</name>
+ <property>commons.release.2.version</property>
<required>false</required>
<readonly>false</readonly>
- <defaultValue>${commons.release.version.2}</defaultValue>
+ <defaultValue>${commons.release.2.version}</defaultValue>
<type>java.lang.String</type>
<description>The version of an alternative release of the
project.</description>
</parameter>
<parameter>
- <name>commons.release.desc.2</name>
- <property>commons.release.desc.2</property>
+ <name>commons.release.2.desc</name>
+ <property>commons.release.2.desc</property>
<required>false</required>
<readonly>false</readonly>
- <defaultValue>${commons.release.desc.2}</defaultValue>
+ <defaultValue>${commons.release.2.desc}</defaultValue>
<type>java.lang.String</type>
<description>Alternative Release Title or
Description.</description>
</parameter>
Modified:
commons/proper/commons-build-plugin/trunk/src/site/resources/download-page-2release.jpg
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/site/resources/download-page-2release.jpg?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
Binary files - no diff available.
Modified:
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page-mojo.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page-mojo.xml?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
---
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page-mojo.xml
(original)
+++
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page-mojo.xml
Fri Feb 19 02:43:21 2010
@@ -49,12 +49,6 @@
<td>The version of the latest release of the
project.<br/><strong>Default value is</strong>:
<code>${commons.release.version}</code>.</td>
</tr>
<tr>
- <td><strong><a
href="#commons.release.desc">commons.release.desc</a></strong></td>
- <td><code>String</code></td>
- <td><code>-</code></td>
- <td>Release Title or Description.<br/><strong>Default value
is</strong>: <code>${commons.release.desc}</code>.</td>
- </tr>
- <tr>
<td><strong><a
href="#commons.binary.suffix">commons.binary.suffix</a></strong></td>
<td><code>String</code></td>
<td><code>-</code></td>
@@ -77,16 +71,22 @@
<th>Description</th>
</tr>
<tr>
- <td><strong><a
href="#commons.release.version.2">commons.release.version.2</a></strong></td>
+ <td><strong><a
href="#commons.release.desc">commons.release.desc</a></strong></td>
+ <td><code>String</code></td>
+ <td><code>-</code></td>
+ <td>Release Title or Description.<br/><strong>Default value
is</strong>: <code>${commons.release.desc}</code>.</td>
+ </tr>
+ <tr>
+ <td><strong><a
href="#commons.release.2.version">commons.release.2.version</a></strong></td>
<td><code>String</code></td>
<td><code>-</code></td>
- <td>The version of an alternative release of the
project.<br/><strong>Default value is</strong>:
<code>${commons.release.version.2}</code>.</td>
+ <td>The version of an alternative release of the
project.<br/><strong>Default value is</strong>:
<code>${commons.release.2.version}</code>.</td>
</tr>
<tr>
- <td><strong><a
href="#commons.release.desc.2">commons.release.desc.2</a></strong></td>
+ <td><strong><a
href="#commons.release.2.desc">commons.release.2.desc</a></strong></td>
<td><code>String</code></td>
<td><code>-</code></td>
- <td>Alternative Release Title or Description.<br/><strong>Default
value is</strong>: <code>${commons.release.desc.2}</code>.</td>
+ <td>Alternative Release Title or Description.<br/><strong>Default
value is</strong>: <code>${commons.release.2.desc}</code>.</td>
</tr>
<tr>
<td><strong><a href="#messageLevel">messageLevel</a></strong></td>
@@ -107,20 +107,20 @@
<div>Release Title or Description.</div>
<ul>
<li><strong>Type</strong>: <code>java.lang.String</code></li>
- <li><strong>Required</strong>: <code>Yes</code></li>
+ <li><strong>Required</strong>: <code>No</code></li>
<li><strong>Default</strong>:
<code>${commons.release.desc}</code></li>
- </ul><hr/><p><strong><a
name="commons.release.version.2">commons.release.version.2</a>:</strong></p>
+ </ul><hr/><p><strong><a
name="commons.release.2.version">commons.release.2.version</a>:</strong></p>
<div>The version of an alternative release of the project.</div>
<ul>
<li><strong>Type</strong>: <code>java.lang.String</code></li>
<li><strong>Required</strong>: <code>No</code></li>
- <li><strong>Default</strong>:
<code>${commons.release.version.2}</code></li>
- </ul><hr/><p><strong><a
name="commons.release.desc.2">commons.release.desc.2</a>:</strong></p>
+ <li><strong>Default</strong>:
<code>${commons.release.2.version}</code></li>
+ </ul><hr/><p><strong><a
name="commons.release.2.desc">commons.release.2.desc</a>:</strong></p>
<div>Alternative Release Title or Description.</div>
<ul>
<li><strong>Type</strong>: <code>java.lang.String</code></li>
<li><strong>Required</strong>: <code>No</code></li>
- <li><strong>Default</strong>:
<code>${commons.release.desc.2}</code></li>
+ <li><strong>Default</strong>:
<code>${commons.release.2.desc}</code></li>
</ul><hr/><p><strong><a
name="commons.binary.suffix">commons.binary.suffix</a>:</strong></p>
<div>The suffix for the binary distro.</div>
<ul>
Modified:
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page.xml?rev=911679&r1=911678&r2=911679&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page.xml
(original)
+++ commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page.xml
Fri Feb 19 02:43:21 2010
@@ -84,8 +84,8 @@
<p>
Sometimes there is a requirement to list two versions on the
download page. This can be achieved using the following properties:
<ul>
- <li><b>commons.release.version.2</b> - The version number
of the alternative release of the component</li>
- <li><b>commons.release.desc.2</b> - (<i>optional</i>)
Additional text to append to the section name of the alternative release</li>
+ <li><b>commons.release.2.version</b> - The version number
of the alternative release of the component</li>
+ <li><b>commons.release.2.desc</b> - (<i>optional</i>)
Additional text to append to the section name of the alternative release</li>
</ul>
</p>
<p>
@@ -95,8 +95,8 @@
<commons.componentid>dbcp</commons.componentid>
<commons.release.version>1.4</commons.release.version>
<commons.release.desc>for JDBC 4 (JDK 1.6)</commons.release.desc>
- <commons.release.version.2>1.3</commons.release.version.2>
- <commons.release.desc.2> for JDBC 3 (JDK
1.4-1.5)</commons.release.desc.2>
+ <commons.release.2.version>1.3</commons.release.2.version>
+ <commons.release.2.desc> for JDBC 3 (JDK
1.4-1.5)</commons.release.2.desc>
</properties>
]]></source>
</p>
