From 2f556ad9ae5055970cb71673ea32dd1eed222fb8 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Thu, 26 Apr 2018 23:41:16 +0200
Subject: [PATCH 1/2] Merge changes in master

---
 manual/Tasks/property.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manual/Tasks/property.html b/manual/Tasks/property.html
index e8e57bb21..4e42af10e 100644
--- a/manual/Tasks/property.html
+++ b/manual/Tasks/property.html
@@ -52,8 +52,8 @@ resource) in the project.  Properties are case sensitive.</p>
   <li>By setting the <i>runtime</i> attribute with a prefix to use.
     Properties <code>prefix.availableProcessors</code>,
     <code>prefix.freeMemory</code>, <code>prefix.totalMemory</code>
-    and <code>prefix.maxMemory</code> will be defined with values that
-    correspond to the corresponding methods of
+    and <code>prefix.maxMemory</code> will be defined with values
+    returned by the corresponding methods of
     the <a href="https://docs.oracle.com/javase/10/docs/api/java/lang/Runtime.html">Runtime</a>
     class.</li>
 </ul>
@@ -106,7 +106,7 @@ to end with <tt>.xml</tt>.</p>
     <td valign="top">resource</td>
     <td valign="top"> the name of the classpath resource containing
       properties settings in properties file format.</td>
-    <td valign="middle" align="center" rowspan="4">One of these, when
+    <td valign="middle" align="center" rowspan="5">One of these, when
       <b>not</b> using the name attribute</td>
   </tr>
   <tr>
@@ -135,7 +135,7 @@ to end with <tt>.xml</tt>.</p>
   </tr>
   <tr>
     <td valign="top">runtime</td>
-    <td valign="top">the prefix to use when retrieving Runtime properties. Thus
+    <td valign="top">the prefix to use when retrieving runtime properties. Thus
     if you specify runtime=&quot;myrt&quot; you will be able to access
     runtime values corresponding to methods in
     the <a href="https://docs.oracle.com/javase/10/docs/api/java/lang/Runtime.html">Runtime</a>
@@ -143,7 +143,7 @@ to end with <tt>.xml</tt>.</p>
     &quot;myrt.maxMemory&quot;, &quot;myrt.totalMemory&quot; or
     &quot;myrt.freeMemory&quot;. Note that if you supply a property name with a final
     &quot;.&quot; it will not be doubled; i.e. runtime=&quot;myrt.&quot; will still
-    allow access of prpperties through &quot;myrt.maxMemory&quot;.<br>
+    allow access of runtime properties as e.g. &quot;myrt.maxMemory&quot;.<br>
     Note also that the property values are snapshots taken at the point in time
     when the <code>property</code> has been executed.
     <em>Since Ant 1.9.12</em>

From 021bcdd84d04bbeef5396b283ab6bd6e051465b7 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 27 Apr 2018 07:59:00 +0200
Subject: [PATCH 2/2] add rudimentary testcase for <cab> task

---
 src/tests/antunit/taskdefs/optional/cab.xml | 46 +++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/tests/antunit/taskdefs/optional/cab.xml

diff --git a/src/tests/antunit/taskdefs/optional/cab.xml b/src/tests/antunit/taskdefs/optional/cab.xml
new file mode 100644
index 000000000..49091074a
--- /dev/null
+++ b/src/tests/antunit/taskdefs/optional/cab.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../../antunit-base.xml" />
+
+  <target name="testBasedirOrFilesetRequired">
+    <au:expectfailure message="must specify basedir or fileset"
+                      expectedMessage="basedir attribute or one nested fileset is required!">
+      <cab/>
+    </au:expectfailure>
+  </target>
+
+  <target name="testOnlyOneFileset">
+    <au:expectfailure message="only one fileset is allowed"
+                      expectedMessage="Only one nested fileset allowed">
+      <cab>
+        <fileset dir="a"/>
+        <fileset dir="b"/>
+      </cab>
+    </au:expectfailure>
+  </target>
+
+  <target name="testCantHaveBasedirAndFileset">
+    <au:expectfailure message="can't have basedir and nested fileset"
+                      expectedMessage="Both basedir attribute and a nested fileset is not allowed">
+      <cab basedir=".">
+        <fileset dir="b"/>
+      </cab>
+    </au:expectfailure>
+  </target>
+</project>