From a2b3e159f5f91f2f3a03d429c05cb5ee218b4f89 Mon Sep 17 00:00:00 2001
From: Nicolas Lalevee <hibou@apache.org>
Date: Tue, 9 Nov 2010 14:14:36 +0000
Subject: [PATCH] unit test, doc and fix for the bindtargets task

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1032990 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                      |  3 ++
 docs/manual/tasklist.html                     |  1 +
 .../tools/ant/taskdefs/BindTargets.java       |  2 +-
 .../tools/ant/taskdefs/defaults.properties    |  1 +
 src/tests/antunit/core/bindtargets-test.xml   | 39 +++++++++++++++++++
 5 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/antunit/core/bindtargets-test.xml

diff --git a/WHATSNEW b/WHATSNEW
index 0359d8365..a5301d5f9 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -270,6 +270,9 @@ Other changes:
    BuildExceptions.
    Bugzilla Report 48835.
 
+ * New task <bindtargets> to make a list of targets bound to some
+   specified extension point.
+
 Changes from Ant 1.8.0 TO Ant 1.8.1 
 ===================================
 
diff --git a/docs/manual/tasklist.html b/docs/manual/tasklist.html
index 1a598df95..f7b5524b8 100644
--- a/docs/manual/tasklist.html
+++ b/docs/manual/tasklist.html
@@ -45,6 +45,7 @@
 <li><a href="Tasks/augment.html">Augment</a></li>
 <li><a href="Tasks/available.html">Available</a></li>
 <li><a href="Tasks/basename.html">Basename</a></li>
+<li><a href="Tasks/bindtargets.html">Bindtargets</a></li>
 <li><a href="Tasks/buildnumber.html">BuildNumber</a></li>
 <li><a href="Tasks/unpack.html">BUnzip2</a></li>
 <li><a href="Tasks/pack.html">BZip2</a></li>
diff --git a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
index e62d0f876..c40fd74ad 100644
--- a/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
+++ b/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
@@ -85,7 +85,7 @@ public class BindTargets extends Task {
         Iterator itTarget = targets.iterator();
         while (itTarget.hasNext()) {
             helper.getExtensionStack().add(
-                    new String[] { (String) itTarget.next(), extensionPoint,
+                    new String[] { extensionPoint, (String) itTarget.next(),
                                             onMissingExtensionPoint });
         }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
index 533f6c23c..a554e9965 100644
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
@@ -23,6 +23,7 @@ apt=org.apache.tools.ant.taskdefs.Apt
 augment=org.apache.tools.ant.taskdefs.AugmentReference
 available=org.apache.tools.ant.taskdefs.Available
 basename=org.apache.tools.ant.taskdefs.Basename
+bindtargets=org.apache.tools.ant.taskdefs.BindTargets
 buildnumber=org.apache.tools.ant.taskdefs.BuildNumber
 bunzip2=org.apache.tools.ant.taskdefs.BUnzip2
 bzip2=org.apache.tools.ant.taskdefs.BZip2
diff --git a/src/tests/antunit/core/bindtargets-test.xml b/src/tests/antunit/core/bindtargets-test.xml
new file mode 100644
index 000000000..3d66cd462
--- /dev/null
+++ b/src/tests/antunit/core/bindtargets-test.xml
@@ -0,0 +1,39 @@
+<?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 xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+
+  <import file="../antunit-base.xml"/>
+
+  <target name="binded">
+    <property name="test-binded" value="ok" />
+  </target>
+
+  <target name="binded2">
+    <property name="test-binded2" value="ok" />
+  </target>
+
+  <extension-point name="extension" />
+
+  <bindtargets targets="binded,binded2" extensionPoint="extension" />
+
+  <target name="testBind" depends="extension">
+    <au:assertPropertyEquals name="test-binded" value="ok"/>
+    <au:assertPropertyEquals name="test-binded2" value="ok"/>
+  </target>
+
+</project>