commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1739789 - in /commons/proper/commons-build-plugin/trunk: ./ src/main/resources/commons-xdoc-templates/ src/main/scripts/ src/site/xdoc/
Date Mon, 18 Apr 2016 16:45:41 GMT
Author: sebb
Date: Mon Apr 18 16:45:41 2016
New Revision: 1739789

URL: http://svn.apache.org/viewvc?rev=1739789&view=rev
Log:
Change to use variable subdir property whilst the exact format is worked out

Modified:
    commons/proper/commons-build-plugin/trunk/RELEASE-NOTES.txt
    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/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/commons-build-plugin/trunk/RELEASE-NOTES.txt?rev=1739789&r1=1739788&r2=1739789&view=diff
==============================================================================
--- commons/proper/commons-build-plugin/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/commons-build-plugin/trunk/RELEASE-NOTES.txt Mon Apr 18 16:45:41 2016
@@ -10,12 +10,11 @@ See:
    http://commons.apache.org/commons-build-plugin/
 
 
-VERSION 1.6 - 2016-04-20
+VERSION 1.6 - 2016-04-21
 ------------------------
 
 Changes since the last release
-1. Added new download-page layout property: 
-   set this to 'version' to use a single directory of the form commons-build-plugin-1.6 rather
than binaries/source 
+1. Added new download-page subdir property: set this (e.g. to '1.2' or 'lang-1.2' etc) to
override the default of binaries/source 
 
 VERSION 1.5 - 2015-11-28
 ------------------------

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=1739789&r1=1739788&r2=1739789&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
Mon Apr 18 16:45:41 2016
@@ -35,15 +35,13 @@ limitations under the License.
  |    - 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.subdir  (optional)                              |
  |                                                                      |
  |    - 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)                  |
+ |    - commons.release.2/3.subdir        (optional)                    |
  |                                                                      |
  | 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=1739789&r1=1739788&r2=1739789&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 Mon
Apr 18 16:45:41 2016
@@ -149,17 +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.subdir   : ${commons.release.subdir}"
/>
         <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.2.subdir : ${commons.release.2.subdir}"
/>
         <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.release.3.subdir : ${commons.release.3.subdir}"
/>
         <echo level="${level}" message="----- commons:download-page - Parameters - END
  -----" />
 
         <echo level="info" message="*** Generating ${project.name} ${commons.release.version}
Download Page ***" />
@@ -200,11 +200,11 @@
     <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 property="BINDIR" value="${commons.release.subdir}" else="binaries">
+          <isset property="commons.release.subdir"/>
         </condition>
-        <condition property="SRCDIR" value="${commons.release.version}" else="source">
-          <equals arg1="${commons.release.layout}" arg2="version"/>
+        <condition property="SRCDIR" value="${commons.release.subdir}" else="source">
+          <isset property="commons.release.subdir"/>
         </condition>
 
         <!-- Load Body -->
@@ -228,14 +228,14 @@
     </target>
 
     <target name="load-download-page-body-2" if="commons.release.2.version">
-        <echo  level="info" message="*** loading download-page body(2) file***" />
+      <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>
+      <condition property="BINDIR" value="${commons.release.2.subdir}" else="binaries">
+        <isset property="commons.release.2.subdir"/>
+      </condition>
+      <condition property="SRCDIR" value="${commons.release.2.subdir}" else="source">
+        <isset property="commons.release.2.subdir"/>
+      </condition>
 
         <!-- Load Body -->
         <loadresource property="download-page-body-2-xml">
@@ -258,14 +258,14 @@
     </target>
 
     <target name="load-download-page-body-3" if="commons.release.3.version">
-        <echo  level="info" message="*** loading download-page body(3) file***" />
+      <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>
+      <condition property="BINDIR" value="${commons.release.3.subdir}" else="binaries">
+        <isset property="commons.release.3.subdir"/>
+      </condition>
+      <condition property="SRCDIR" value="${commons.release.3.subdir}" else="source">
+        <isset property="commons.release.3.subdir"/>
+      </condition>
 
         <!-- Load Body -->
         <loadresource property="download-page-body-3-xml">

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=1739789&r1=1739788&r2=1739789&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 Mon
Apr 18 16:45:41 2016
@@ -181,13 +181,13 @@
                     <description>Release Title or Description.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.layout</name> 
-                    <property>commons.release.layout</property>
+                    <name>commons.release.subdir</name> 
+                    <property>commons.release.subdir</property>
                     <required>false</required>
                     <readonly>false</readonly>
-                    <defaultValue>${commons.release.layout}</defaultValue>
+                    <defaultValue>${commons.release.subdir}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>Layout style (e.g. version)</description>
+                    <description>Subdirectory (instead of source/binaries)</description>
                 </parameter>
                 <!-- commons.release.2.* -->
                 <parameter>
@@ -227,13 +227,13 @@
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.2.layout</name> 
-                    <property>commons.release.2.layout</property>
+                    <name>commons.release.2.subdir</name> 
+                    <property>commons.release.2.subdir</property>
                     <required>false</required>
                     <readonly>false</readonly>
-                    <defaultValue>${commons.release.2.layout}</defaultValue>
+                    <defaultValue>${commons.release.2.subdir}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>Layout style (e.g. version)</description>
+                    <description>Subdirectory (instead of source/binaries)</description>
                 </parameter>
                 <!-- commons.release.3.* -->
                 <parameter>
@@ -273,13 +273,13 @@
                     <description>The suffix for the alternative release binary distro.</description>
                 </parameter>
                 <parameter>
-                    <name>commons.release.3.layout</name> 
-                    <property>commons.release.3.layout</property>
+                    <name>commons.release.3.subdir</name> 
+                    <property>commons.release.3.subdir</property>
                     <required>false</required>
                     <readonly>false</readonly>
-                    <defaultValue>${commons.release.3.layout}</defaultValue>
+                    <defaultValue>${commons.release.3.subdir}</defaultValue>
                     <type>java.lang.String</type>
-                    <description>Layout style (e.g. version)</description>
+                    <description>Subdirectory (instead of source/binaries)</description>
                 </parameter>
             </parameters>
         </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=1739789&r1=1739788&r2=1739789&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 Mon Apr
18 16:45:41 2016
@@ -95,10 +95,10 @@
             <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><strong><a href="#commons.release.subdir">commons.release.subdir</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>
+            <td>Subdirectory (if not source/binaries)<br/><strong>Default
value is</strong>: <code>${commons.release.subdir}</code>.</td>
           </tr>
           <!-- commons.release.2.* -->
           <tr>
@@ -120,10 +120,10 @@
             <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><strong><a href="#commons.release.subdir">commons.release.2.subdir</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>
+            <td>Subdirectory (if not source/binaries)<br/><strong>Default
value is</strong>: <code>${commons.release.2.subdir}</code>.</td>
           </tr>
           <!-- commons.release.3.* -->
           <tr>
@@ -145,10 +145,10 @@
             <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><strong><a href="#commons.release.subdir">commons.release.3.subdir</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>
+            <td>Subdirectory (if not source/binaries)<br/><strong>Default
value is</strong>: <code>${commons.release.3.subdir}</code>.</td>
           </tr>
           <!-- Miscellaneous -->
           <tr>

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=1739789&r1=1739788&r2=1739789&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 Mon Apr 18 16:45:41
2016
@@ -77,7 +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>
+                    <li><b>commons.release.subdir</b> - The subdirectory
to use. This defaults to using separate source/binaries folders; it set it will be used as
the dierctory for both.</li>
                 </ul>
                 </p>
                 <p>



Mime
View raw message