Author: ggregory
Date: Fri Mar 2 21:08:10 2012
New Revision: 1296463
URL: http://svn.apache.org/viewvc?rev=1296463&view=rev
Log:
[COMMONSSITE-66] Add support for a "commons.release.3" set of properties to
offer a 3rd download option
Modified:
commons/proper/commons-build-plugin/trunk/pom.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/xdoc/download-page-mojo.xml
commons/proper/commons-build-plugin/trunk/src/site/xdoc/download-page.xml
commons/proper/commons-build-plugin/trunk/src/site/xdoc/index.xml
Modified: commons/proper/commons-build-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/pom.xml?rev=1296463&r1=1296462&r2=1296463&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/pom.xml (original)
+++ commons/proper/commons-build-plugin/trunk/pom.xml Fri Mar 2 21:08:10 2012
@@ -52,6 +52,13 @@
<name>Dennis Lundberg</name>
<id>dennisl</id>
</developer>
+ <developer>
+ <name>Gary Gregory</name>
+ <id>ggregory</id>
+ <email>ggregory AT apache.org</email>
+ <url>http://www.garygregory.com</url>
+ <timezone>-5</timezone>
+ </developer>
</developers>
<dependencies>
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=1296463&r1=1296462&r2=1296463&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 Mar 2 21:08:10 2012
@@ -153,6 +153,10 @@
<echo level="${level}" message="commons.release.2.name :
${commons.release.2.name}" />
<echo level="${level}" message="commons.release.2.desc :
${commons.release.2.desc}" />
<echo level="${level}" message="commons.release.2.binary.suffix:
${commons.release.2.binary.suffix}" />
+ <echo level="${level}" message="commons.release.3.version:
${commons.release.3.version}" />
+ <echo level="${level}" message="commons.release.3.name :
${commons.release.3.name}" />
+ <echo level="${level}" message="commons.release.3.desc :
${commons.release.3.desc}" />
+ <echo level="${level}" message="commons.release.3.binary.suffix:
${commons.release.3.binary.suffix}" />
<echo level="${level}" message="----- commons:download-page -
Parameters - END -----" />
<echo level="info" message="*** Generating ${project.name}
${commons.release.version} Download Page ***" />
@@ -165,6 +169,7 @@
<antcall target="load-download-page-head"/>
<antcall target="load-download-page-body-1"/>
<antcall target="load-download-page-body-2"/>
+ <antcall target="load-download-page-body-3"/>
<antcall target="load-download-page-foot"/>
<!-- copy to either m1 or m2 xdoc directory -->
@@ -231,6 +236,27 @@
</target>
+ <target name="load-download-page-body-3" if="commons.release.3.version">
+ <echo level="info" message="*** loading download-page body(3)
file***" />
+
+ <!-- Load Body -->
+ <loadresource property="download-page-body-3-xml">
+ <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
+ <filterchain>
+ <replacetokens>
+ <token key="VERSION"
value="${commons.release.3.version}"/>
+ <token key="RELDESC"
value="${commons.release.3.desc}"/>
+ <token key="NAME" value="${project.name}"/>
+ <token key="ID" value="${commons.componentid}"/>
+ <token key="FINAL_NAME"
value="${commons.release.3.name}"/>
+ <token key="BINARY-SUFFIX"
value="${commons.release.3.binary.suffix}"/>
+ </replacetokens>
+ </filterchain>
+ </loadresource>
+ <echo message="${download-page-body-3-xml}"
file="${commonsMojoTempDir}/download_${commons.componentid}.xml" append="true"
/>
+
+ </target>
+
<target name="load-download-page-foot" if="commons.release.version">
<echo level="info" message="*** loading download-page footer files
***" />
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=1296463&r1=1296462&r2=1296463&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 Mar 2 21:08:10 2012
@@ -180,6 +180,7 @@
<type>java.lang.String</type>
<description>Release Title or Description.</description>
</parameter>
+ <!-- commons.release.2.* -->
<parameter>
<name>commons.release.2.version</name>
<property>commons.release.2.version</property>
@@ -216,6 +217,43 @@
<type>java.lang.String</type>
<description>The suffix for the alternative release binary
distro.</description>
</parameter>
+ <!-- commons.release.3.* -->
+ <parameter>
+ <name>commons.release.3.version</name>
+ <property>commons.release.3.version</property>
+ <required>false</required>
+ <readonly>false</readonly>
+ <defaultValue>${commons.release.3.version}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The version of an alternative release of the
project.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.3.name</name>
+ <property>commons.release.3.name</property>
+ <required>true</required>
+ <readonly>false</readonly>
+ <defaultValue>${commons.release.3.name}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The nameof the alternative release of the
project.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.3.desc</name>
+ <property>commons.release.3.desc</property>
+ <required>false</required>
+ <readonly>false</readonly>
+ <defaultValue>${commons.release.3.desc}</defaultValue>
+ <type>java.lang.String</type>
+ <description>Alternative Release Title or
Description.</description>
+ </parameter>
+ <parameter>
+ <name>commons.release.3.binary.suffix</name>
+ <property>commons.release.3.binary.suffix</property>
+ <required>false</required>
+ <readonly>false</readonly>
+
<defaultValue>${commons.release.3.binary.suffix}</defaultValue>
+ <type>java.lang.String</type>
+ <description>The suffix for the alternative release binary
distro.</description>
+ </parameter>
</parameters>
</mojo>
</mojos>
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=1296463&r1=1296462&r2=1296463&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 Mar 2 21:08:10 2012
@@ -58,7 +58,13 @@
<td><strong><a
href="#commons.release.2.name">commons.release.2.name</a></strong></td>
<td><code>String</code></td>
<td><code>-</code></td>
- <td>The nameof the alternative release of the
project.<br/><strong>Default value is</strong>:
<code>${commons.release.2.name}</code>.</td>
+ <td>The name of the alternative release of the
project.<br/><strong>Default value is</strong>:
<code>${commons.release.2.name}</code>.</td>
+ </tr>
+ <tr>
+ <td><strong><a
href="#commons.release.3.name">commons.release.3.name</a></strong></td>
+ <td><code>String</code></td>
+ <td><code>-</code></td>
+ <td>The name of the alternative release of the
project.<br/><strong>Default value is</strong>:
<code>${commons.release.3.name}</code>.</td>
</tr>
<tr>
<td><strong><a href="#basedir">basedir</a></strong></td>
@@ -88,6 +94,7 @@
<td><code>-</code></td>
<td>Release Title or Description.<br/><strong>Default value
is</strong>: <code>${commons.release.desc}</code>.</td>
</tr>
+ <!-- commons.release.2.* -->
<tr>
<td><strong><a
href="#commons.release.2.version">commons.release.2.version</a></strong></td>
<td><code>String</code></td>
@@ -106,6 +113,25 @@
<td><code>-</code></td>
<td>The suffix for the alternative release binary
distro.<br/><strong>Default value is</strong>:
<code>${commons.release.2.binary.suffix}</code>.</td>
</tr>
+ <!-- commons.release.3.* -->
+ <tr>
+ <td><strong><a
href="#commons.release.3.version">commons.release.3.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.3.version}</code>.</td>
+ </tr>
+ <tr>
+ <td><strong><a
href="#commons.release.3.desc">commons.release.3.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.3.desc}</code>.</td>
+ </tr>
+ <tr>
+ <td><strong><a
href="#commons.release.3.binary.suffix">commons.release.3.binary.suffix</a></strong></td>
+ <td><code>String</code></td>
+ <td><code>-</code></td>
+ <td>The suffix for the alternative release binary
distro.<br/><strong>Default value is</strong>:
<code>${commons.release.3.binary.suffix}</code>.</td>
+ </tr>
<tr>
<td><strong><a href="#messageLevel">messageLevel</a></strong></td>
<td><code>String</code></td>
@@ -146,7 +172,7 @@
<li><strong>Required</strong>: <code>No</code></li>
<li><strong>Default</strong>:
<code>${commons.release.2.version}</code></li>
</ul><hr/><p><strong><a
name="commons.release.2.name">commons.release.2.name</a>:</strong></p>
- <div>The nameof the alternative release of the project.</div>
+ <div>The name of the alternative release of the project.</div>
<ul>
<li><strong>Type</strong>: <code>java.lang.String</code></li>
<li><strong>Required</strong>: <code>Yes</code></li>
@@ -163,6 +189,30 @@
<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.2.binary.suffix}</code></li>
+ </ul><hr/><hr/><p><strong><a
name="commons.release.3.version">commons.release.3.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.3.version}</code></li>
+ </ul><hr/><p><strong><a
name="commons.release.3.name">commons.release.3.name</a>:</strong></p>
+ <div>The name of the alternative release of the project.</div>
+ <ul>
+ <li><strong>Type</strong>: <code>java.lang.String</code></li>
+ <li><strong>Required</strong>: <code>Yes</code></li>
+ <li><strong>Default</strong>:
<code>${commons.release.3.name}</code></li>
+ </ul><hr/><p><strong><a
name="commons.release.3.desc">commons.release.3.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.3.desc}</code></li>
+ </ul><hr/><p><strong><a
name="commons.release.3.binary.suffix">commons.release.3.binary.suffix</a>:</strong></p>
+ <div>The suffix for the alternative release binary distro.</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.3.binary.suffix}</code></li>
</ul><hr/><p><strong><a name="basedir">basedir</a>:</strong></p>
<div>The base directory from which to execute the Ant script.</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=1296463&r1=1296462&r2=1296463&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 Mar 2 21:08:10 2012
@@ -100,6 +100,16 @@
</ul>
</p>
<p>
+ You can have a third version on the download page. This can be
achieved using the following properties:
+ <ul>
+ <li><b>commons.release.3.version</b> - The version number
of the alternative release of the component</li>
+ <li><b>commons.release.3.name</b> - (<i>optional -
defaults to <code>${commons.release.3.name}</code></i>) The name of the
alternative release of the component</li>
+ <li><b>commons.release.3.desc</b> - (<i>optional</i>)
Additional text to append to the section name of the alternative release</li>
+ <li><b>commons.release.3.binary.suffix</b> - (<i>optional
- defaults to <code>-bin</code></i>) The suffix for the alternative
+ binary release (some components use "-bin", others
have no suffix)</li>
+ </ul>
+ </p>
+ <p>
Example configuration for Commons DBCP with two releases:
<source><![CDATA[
<properties>
Modified: commons/proper/commons-build-plugin/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/site/xdoc/index.xml?rev=1296463&r1=1296462&r2=1296463&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/site/xdoc/index.xml (original)
+++ commons/proper/commons-build-plugin/trunk/src/site/xdoc/index.xml Fri Mar
2 21:08:10 2012
@@ -57,11 +57,11 @@
<p>
Configure the plugin in the <code><build></code> section of
the <code>pom.xml</code>
<source><![CDATA[
- <plugin>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-build-plugin</artifactId>
- <version>1.2</version>
- </plugin>
+<plugin>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-build-plugin</artifactId>
+ <version>1.4</version>
+</plugin>
]]></source>
</p>
<p>
