You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/11/29 14:40:27 UTC
[16/50] commons-build-plugin git commit: Change to use variable
subdir property whilst the exact format is worked out
Change to use variable subdir property whilst the exact format is worked out
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/commons-build-plugin/trunk@1739789 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/commit/3ba2467e
Tree: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/tree/3ba2467e
Diff: http://git-wip-us.apache.org/repos/asf/commons-build-plugin/diff/3ba2467e
Branch: refs/heads/master
Commit: 3ba2467e500b5a7527ca7600b116894192433749
Parents: 78ca883
Author: Sebastian Bazley <se...@apache.org>
Authored: Mon Apr 18 16:45:41 2016 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Mon Apr 18 16:45:41 2016 +0000
----------------------------------------------------------------------
RELEASE-NOTES.txt | 5 +--
.../download-page-head.xml | 6 +--
src/main/scripts/generate-xdocs.build.xml | 44 ++++++++++----------
src/main/scripts/generate-xdocs.mojos.xml | 24 +++++------
src/site/xdoc/download-page-mojo.xml | 12 +++---
src/site/xdoc/download-page.xml | 2 +-
6 files changed, 45 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e5b17c8..0d94500 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -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
------------------------
http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/main/resources/commons-xdoc-templates/download-page-head.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/commons-xdoc-templates/download-page-head.xml b/src/main/resources/commons-xdoc-templates/download-page-head.xml
index f6bd2ad..ee1ff15 100644
--- a/src/main/resources/commons-xdoc-templates/download-page-head.xml
+++ b/src/main/resources/commons-xdoc-templates/download-page-head.xml
@@ -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: |
http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/main/scripts/generate-xdocs.build.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.build.xml b/src/main/scripts/generate-xdocs.build.xml
index 7ba5b2e..af82135 100644
--- a/src/main/scripts/generate-xdocs.build.xml
+++ b/src/main/scripts/generate-xdocs.build.xml
@@ -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***" />
-
- <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>
+ <echo level="info" message="*** loading download-page body(3) file***" />
+
+ <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">
http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/main/scripts/generate-xdocs.mojos.xml
----------------------------------------------------------------------
diff --git a/src/main/scripts/generate-xdocs.mojos.xml b/src/main/scripts/generate-xdocs.mojos.xml
index 5d461cc..e58056c 100644
--- a/src/main/scripts/generate-xdocs.mojos.xml
+++ b/src/main/scripts/generate-xdocs.mojos.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/site/xdoc/download-page-mojo.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page-mojo.xml b/src/site/xdoc/download-page-mojo.xml
index b6074d3..5b8dadb 100644
--- a/src/site/xdoc/download-page-mojo.xml
+++ b/src/site/xdoc/download-page-mojo.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/commons-build-plugin/blob/3ba2467e/src/site/xdoc/download-page.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download-page.xml b/src/site/xdoc/download-page.xml
index daba417..87a5fcb 100644
--- a/src/site/xdoc/download-page.xml
+++ b/src/site/xdoc/download-page.xml
@@ -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>