commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r931946 - in /commons/proper/commons-build-plugin/trunk/src: main/scripts/generate-xdocs.build.xml main/scripts/generate-xdocs.mojos.xml site/xdoc/download-page-mojo.xml site/xdoc/download-page.xml
Date Thu, 08 Apr 2010 13:57:19 GMT
Author: niallp
Date: Thu Apr  8 13:57:19 2010
New Revision: 931946

URL: http://svn.apache.org/viewvc?rev=931946&view=rev
Log:
Add ${commons.release.name} property (for VFS and SANSELAN which have different artifactIds
in the release name)

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

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=931946&r1=931945&r2=931946&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 Thu
Apr  8 13:57:19 2010
@@ -146,9 +146,11 @@
         <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.name     : ${commons.release.name}"
/>
         <echo level="${level}" message="commons.release.desc     : ${commons.release.desc}"
/>
         <echo level="${level}" message="commons.binary.suffix    : ${commons.binary.suffix}"
/>
         <echo level="${level}" message="commons.release.2.version: ${commons.release.2.version}"
/>
+        <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:download-page - Parameters - END
  -----" />
@@ -199,7 +201,7 @@
                     <token key="RELDESC"       value="${commons.release.desc}"/>
                     <token key="NAME"          value="${project.name}"/>
                     <token key="ID"            value="${commons.componentid}"/>
-                    <token key="FINAL_NAME"    value="${project.artifactId}-${commons.release.version}"/>
+                    <token key="FINAL_NAME"    value="${commons.release.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.binary.suffix}"/>
                 </replacetokens>
             </filterchain>
@@ -220,7 +222,7 @@
                     <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.2.version}"/>
+                    <token key="FINAL_NAME"    value="${commons.release.2.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.release.2.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=931946&r1=931945&r2=931946&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 Thu
Apr  8 13:57:19 2010
@@ -154,6 +154,15 @@
                     <description>The version of the latest release of the project.</description>
                 </parameter>
                 <parameter>
+                    <name>commons.release.name</name> 
+                    <property>commons.release.name</property>
+                    <required>true</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.name}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>The name of the latest release of the project.</description>
+                </parameter>
+                <parameter>
                     <name>commons.binary.suffix</name> 
                     <property>commons.binary.suffix</property>
                     <required>false</required>
@@ -181,6 +190,15 @@
                     <description>The version of an alternative release of the project.</description>
                 </parameter>
                 <parameter>
+                    <name>commons.release.2.name</name> 
+                    <property>commons.release.2.name</property>
+                    <required>true</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.2.name}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>The nameof the alternative release of the project.</description>
+                </parameter>
+                <parameter>
                     <name>commons.release.2.desc</name> 
                     <property>commons.release.2.desc</property>
                     <required>false</required>

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=931946&r1=931945&r2=931946&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 Thu Apr
 8 13:57:19 2010
@@ -49,6 +49,18 @@
             <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.name">commons.release.name</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>The name of the latest release of the project.<br/><strong>Default
value is</strong>: <code>${commons.release.name}</code>.</td>
+          </tr>
+          <tr>
+            <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>
+          </tr>
+          <tr>
             <td><strong><a href="#basedir">basedir</a></strong></td>
             <td><code>File</code></td>
             <td><code>-</code></td>
@@ -109,6 +121,12 @@
           <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.version}</code></li>
+        </ul><hr/><p><strong><a name="commons.release.name">commons.release.name</a>:</strong></p>
+        <div>The name of the latest 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.name}</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>
@@ -127,6 +145,12 @@
           <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.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>
+        <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.2.name}</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>

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=931946&r1=931945&r2=931946&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 Thu Apr  8 13:57:19
2010
@@ -73,6 +73,7 @@
                 <ul>
                     <li><b>commons.componentid</b> - Commons component
id</li>
                     <li><b>commons.release.version</b> - The version number
of the latest release of the component</li>
+                    <li><b>commons.release.name</b> - (<i>optional
- defaults to <code>${commons.release.name}</code></i>) The name of the
latest release of the component</li>
                     <li><b>commons.release.desc</b> - (<i>optional</i>)
The download links are shown in a section with the component name and release version - if
this paratmeter is specified then this text is appended</li>
                     <li><b>commons.binary.suffix</b> - (<i>optional
- defaults to <code>-bin</code></i>) The suffix for the binary release
                         (some components use "-bin", others have no suffix)</li>
@@ -92,6 +93,7 @@
                 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.2.version</b> - The version
number of the alternative release of the component</li>
+                    <li><b>commons.release.2.name</b> - (<i>optional
- defaults to <code>${commons.release.2.name}</code></i>) The name 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>
                     <li><b>commons.release.2.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>



Mime
View raw message