commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1739607 - in /commons/proper/commons-build-plugin/trunk/src: main/resources/commons-xdoc-templates/ main/scripts/ site/xdoc/
Date Sun, 17 Apr 2016 13:23:47 GMT
Author: sebb
Date: Sun Apr 17 13:23:46 2016
New Revision: 1739607

URL: http://svn.apache.org/viewvc?rev=1739607&view=rev
Log:
Implement commons.release.layout for download-page goal

Modified:
    commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.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/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-body.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml?rev=1739607&r1=1739606&r2=1739607&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
(original)
+++ commons/proper/commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates/download-page-body.xml
Sun Apr 17 13:23:46 2016
@@ -2,28 +2,28 @@
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@FINAL_NAME@@BINARY-SUFFIX@.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz">@FINAL_NAME@@BINARY-SUFFIX@.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip">@FINAL_NAME@@BINARY-SUFFIX@.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/binaries/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip">@FINAL_NAME@@BINARY-SUFFIX@.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@BINDIR@/@FINAL_NAME@@BINARY-SUFFIX@.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.tar.gz">@FINAL_NAME@-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz">@FINAL_NAME@-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/@ID@/source/@FINAL_NAME@-src.zip">@FINAL_NAME@-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.md5">md5</a></td>
-              <td><a href="https://www.apache.org/dist/commons/@ID@/source/@FINAL_NAME@-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip">@FINAL_NAME@-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.md5">md5</a></td>
+              <td><a href="https://www.apache.org/dist/commons/@ID@/@SRCDIR@/@FINAL_NAME@-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>

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=1739607&r1=1739606&r2=1739607&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
Sun Apr 17 13:23:46 2016
@@ -32,14 +32,18 @@ limitations under the License.
  |    - commons.componentid (required, alphabetic, lower case)          |
  |    - commons.release.version (required)                              |
  |    - commons.release.name    (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - commons.binary.suffix   (optional)                              |
  |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
  |    - commons.release.desc    (optional)                              |
+ |    - commons.release.layout  (optional)                              |
+ |      (set to 'version' to use e.g. commons-net-3.5)                  |
  |                                                                      |
  |    - commons.release.2/3.version       (conditional)                 |
  |    - commons.release.2/3.name          (conditional)                 |
  |    - commons.release.2/3.binary.suffix (optional)                    |
  |    - commons.release.2/3.desc          (optional)                    |
+ |    - commons.release.2/3.layout        (optional)                    |
+ |      (set to 'version' to use e.g. commons-net-3.5)                  |
  |                                                                      |
  | 3) Example Properties                                                |
  |    (commons.release.name inherited by parent:                        |

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=1739607&r1=1739606&r2=1739607&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 Sun
Apr 17 13:23:46 2016
@@ -149,14 +149,17 @@
         <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.layout   : ${commons.release.layout}"
/>
         <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.release.2.layout : ${commons.release.2.layout}"
/>
         <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.release.3.layout : ${commons.release.3.layout}"
/>
         <echo level="${level}" message="----- commons:download-page - Parameters - END
  -----" />
 
         <echo level="info" message="*** Generating ${project.name} ${commons.release.version}
Download Page ***" />
@@ -197,6 +200,13 @@
     <target name="load-download-page-body-1" if="commons.release.version">
         <echo  level="info" message="*** loading download-page body(1) file***" />
 
+        <condition property="BINDIR" value="${commons.release.version}" else="binaries">
+          <equals arg1="${commons.release.layout}" arg2="version"/>
+        </condition>
+        <condition property="SRCDIR" value="${commons.release.version}" else="source">
+          <equals arg1="${commons.release.layout}" arg2="version"/>
+        </condition>
+
         <!-- Load Body -->
         <loadresource property="download-page-body-1-xml">
             <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
@@ -208,6 +218,8 @@
                     <token key="ID"            value="${commons.componentid}"/>
                     <token key="FINAL_NAME"    value="${commons.release.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.binary.suffix}"/>
+                    <token key="BINDIR"        value="${BINDIR}"/>
+                    <token key="SRCDIR"        value="${SRCDIR}"/>
                 </replacetokens>
             </filterchain>
         </loadresource>
@@ -218,6 +230,13 @@
     <target name="load-download-page-body-2" if="commons.release.2.version">
         <echo  level="info" message="*** loading download-page body(2) file***" />
 
+        <condition property="BINDIR" value="${commons.release.2.version}" else="binaries">
+          <equals arg1="${commons.release.2.layout}" arg2="version"/>
+        </condition>
+        <condition property="SRCDIR" value="${commons.release.2.version}" else="source">
+          <equals arg1="${commons.release.2.layout}" arg2="version"/>
+        </condition>
+
         <!-- Load Body -->
         <loadresource property="download-page-body-2-xml">
             <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
@@ -229,6 +248,8 @@
                     <token key="ID"            value="${commons.componentid}"/>
                     <token key="FINAL_NAME"    value="${commons.release.2.name}"/>
                     <token key="BINARY-SUFFIX" value="${commons.release.2.binary.suffix}"/>
+                    <token key="BINDIR"        value="${BINDIR}"/>
+                    <token key="SRCDIR"        value="${SRCDIR}"/>
                 </replacetokens>
             </filterchain>
         </loadresource>
@@ -239,6 +260,13 @@
     <target name="load-download-page-body-3" if="commons.release.3.version">
         <echo  level="info" message="*** loading download-page body(3) file***" />
 
+        <condition property="BINDIR" value="${commons.release.3.version}" else="binaries">
+          <equals arg1="${commons.release.3.layout}" arg2="version"/>
+        </condition>
+        <condition property="SRCDIR" value="${commons.release.3.version}" else="source">
+          <equals arg1="${commons.release.3.layout}" arg2="version"/>
+        </condition>
+
         <!-- Load Body -->
         <loadresource property="download-page-body-3-xml">
             <javaresource name="${commonsMojoXdocDir}/download-page-body.xml"/>
@@ -250,6 +278,8 @@
                     <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}"/>
+                    <token key="BINDIR"        value="${BINDIR}"/>
+                    <token key="SRCDIR"        value="${SRCDIR}"/>
                 </replacetokens>
             </filterchain>
         </loadresource>

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=1739607&r1=1739606&r2=1739607&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 Sun
Apr 17 13:23:46 2016
@@ -180,6 +180,15 @@
                     <type>java.lang.String</type>
                     <description>Release Title or Description.</description>
                 </parameter>
+                <parameter>
+                    <name>commons.release.layout</name> 
+                    <property>commons.release.layout</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.layout}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Layout style (e.g. version)</description>
+                </parameter>
                 <!-- commons.release.2.* -->
                 <parameter>
                     <name>commons.release.2.version</name> 
@@ -217,6 +226,15 @@
                     <type>java.lang.String</type>
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
+                <parameter>
+                    <name>commons.release.2.layout</name> 
+                    <property>commons.release.2.layout</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.2.layout}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Layout style (e.g. version)</description>
+                </parameter>
                 <!-- commons.release.3.* -->
                 <parameter>
                     <name>commons.release.3.version</name> 
@@ -254,6 +272,15 @@
                     <type>java.lang.String</type>
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
+                <parameter>
+                    <name>commons.release.3.layout</name> 
+                    <property>commons.release.3.layout</property>
+                    <required>false</required>
+                    <readonly>false</readonly>
+                    <defaultValue>${commons.release.3.layout}</defaultValue>
+                    <type>java.lang.String</type>
+                    <description>Layout style (e.g. version)</description>
+                </parameter>
             </parameters>
         </mojo>
         <mojo>

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=1739607&r1=1739606&r2=1739607&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 Sun Apr
17 13:23:46 2016
@@ -94,6 +94,12 @@
             <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.layout">commons.release.layout</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>:
<code>${commons.release.layout}</code>.</td>
+          </tr>
           <!-- commons.release.2.* -->
           <tr>
             <td><strong><a href="#commons.release.2.version">commons.release.2.version</a></strong></td>
@@ -113,6 +119,12 @@
             <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>
+          <tr>
+            <td><strong><a href="#commons.release.layout">commons.release.2.layout</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>:
<code>${commons.release.2.layout}</code>.</td>
+          </tr>
           <!-- commons.release.3.* -->
           <tr>
             <td><strong><a href="#commons.release.3.version">commons.release.3.version</a></strong></td>
@@ -133,6 +145,13 @@
             <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="#commons.release.layout">commons.release.3.layout</a></strong></td>
+            <td><code>String</code></td>
+            <td><code>-</code></td>
+            <td>Layout Style (e.g. version)<br/><strong>Default value is</strong>:
<code>${commons.release.3.layout}</code>.</td>
+          </tr>
+          <!-- Miscellaneous -->
+          <tr>
             <td><strong><a href="#messageLevel">messageLevel</a></strong></td>
             <td><code>String</code></td>
             <td><code>-</code></td>

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=1739607&r1=1739606&r2=1739607&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 Sun Apr 17 13:23:46
2016
@@ -77,6 +77,7 @@
                     <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 parameter 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>
+                    <li><b>commons.release.layout</b> - The layout style.
This defaults to using source/binaries folders; use 'version' to use a single versioned folder
(e.g. commons-build-23) fore binaries and source</li>
                 </ul>
                 </p>
                 <p>



Mime
View raw message