Author: hibou
Date: Tue Nov 9 14:14:36 2010
New Revision: 1032990
URL: http://svn.apache.org/viewvc?rev=1032990&view=rev
Log:
unit test, doc and fix for the bindtargets task
Added:
ant/core/trunk/src/tests/antunit/core/bindtargets-test.xml
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/tasklist.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1032990&r1=1032989&r2=1032990&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Tue Nov 9 14:14:36 2010
@@ -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
===================================
Modified: ant/core/trunk/docs/manual/tasklist.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/tasklist.html?rev=1032990&r1=1032989&r2=1032990&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/tasklist.html (original)
+++ ant/core/trunk/docs/manual/tasklist.html Tue Nov 9 14:14:36 2010
@@ -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>
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BindTargets.java?rev=1032990&r1=1032989&r2=1032990&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BindTargets.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BindTargets.java Tue
Nov 9 14:14:36 2010
@@ -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 });
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties?rev=1032990&r1=1032989&r2=1032990&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
Tue Nov 9 14:14:36 2010
@@ -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
Added: ant/core/trunk/src/tests/antunit/core/bindtargets-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/core/bindtargets-test.xml?rev=1032990&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/core/bindtargets-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/core/bindtargets-test.xml Tue Nov 9
14:14:36 2010
@@ -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>
