Helper class for the check of the configuration of a given task. - * This class provides methods for making assumptions about the task configuration. - * After collecting all violations with assert* and fail - * methods the checkErrors will throw a BuildException with all collected - * messages or does nothing if there wasn't any error.
- * - *Example:
- * - *
- * public class MyTask extends Task {
- * ...
- * public void execute() {
- * TaskConfigurationChecker checker = TaskConfigurationChecker(this);
- * checker.assertConfig(
- * srcdir != null,
- * "Attribute 'srcdir' must be set.
- * );
- * checker.assertConfig(
- * srcdir.exists(),
- * "Srcdir (" + srcdir + ") must exist."
- * );
- * if (someComplexCondition()) {
- * fail("Complex condition failed.");
- * }
- * checker.checkErrors();
- * }
- * }
- *
- *
- * @see Notification Pattern
- */
-public class TaskConfigurationChecker {
-
- /** List of all collected error messages. */
- private List/*Helper class for the check of the configuration of a given task. + * This class provides methods for making assumptions about the task configuration. + * After collecting all violations with assert* and fail + * methods the checkErrors will throw a BuildException with all collected + * messages or does nothing if there wasn't any error.
+ * + *Example:
+ * + *
+ * public class MyTask extends Task {
+ * ...
+ * public void execute() {
+ * TaskConfigurationChecker checker = TaskConfigurationChecker(this);
+ * checker.assertConfig(
+ * srcdir != null,
+ * "Attribute 'srcdir' must be set.
+ * );
+ * checker.assertConfig(
+ * srcdir.exists(),
+ * "Srcdir (" + srcdir + ") must exist."
+ * );
+ * if (someComplexCondition()) {
+ * fail("Complex condition failed.");
+ * }
+ * checker.checkErrors();
+ * }
+ * }
+ *
+ *
+ * @see Notification Pattern
+ */
+public class TaskConfigurationChecker {
+
+ /** List of all collected error messages. */
+ private List/*null.
- */
- public void targetStarted(BuildEvent event) {
- Date now = new Date();
- String name = "Target " + event.getTarget().getName();
- logStart(event, now, name);
- profileData.put(event.getTarget(), now);
- }
-
- /**
- * Logs a message to say that the target has finished.
- *
- * @param event
- * An event with any relevant extra information. Must not be
- * null.
- */
- public void targetFinished(BuildEvent event) {
- Date start = (Date) profileData.remove(event.getTarget());
- String name = "Target " + event.getTarget().getName();
- logFinish(event, start, name);
- }
-
- /**
- * Logs a message to say that the task has started.
- *
- * @param event
- * An event with any relevant extra information. Must not be
- * null.
- */
- public void taskStarted(BuildEvent event) {
- String name = event.getTask().getTaskName();
- Date now = new Date();
- logStart(event, now, name);
- profileData.put(event.getTask(), now);
- }
-
- /**
- * Logs a message to say that the task has finished.
- *
- * @param event
- * An event with any relevant extra information. Must not be
- * null.
- */
- public void taskFinished(BuildEvent event) {
- Date start = (Date) profileData.remove(event.getTask());
- String name = event.getTask().getTaskName();
- logFinish(event, start, name);
- }
-
- private void logFinish(BuildEvent event, Date start, String name) {
- Date now = new Date();
- String msg = null;
- if (start != null) {
- long diff = now.getTime() - start.getTime();
- msg = StringUtils.LINE_SEP + name + ": finished" + now + " ("
- + diff + "ms)";
- } else {
- msg = StringUtils.LINE_SEP + name + ": finished" + now
- + " (unknown duration, start not detected)";
- }
- printMessage(msg, out, event.getPriority());
- log(msg);
- }
-
- private void logStart(BuildEvent event, Date start, String name) {
- String msg = StringUtils.LINE_SEP + name + ": started " + start;
- printMessage(msg, out, event.getPriority());
- log(msg);
- }
-
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.tools.ant.listener;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tools.ant.BuildEvent;
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.util.StringUtils;
+
+/**
+ * This is a special logger that is designed to profile builds.
+ *
+ * @since Ant1.8
+ */
+public class ProfileLogger extends DefaultLogger {
+
+ private Map profileData = new HashMap(); // null.
+ */
+ public void targetStarted(BuildEvent event) {
+ Date now = new Date();
+ String name = "Target " + event.getTarget().getName();
+ logStart(event, now, name);
+ profileData.put(event.getTarget(), now);
+ }
+
+ /**
+ * Logs a message to say that the target has finished.
+ *
+ * @param event
+ * An event with any relevant extra information. Must not be
+ * null.
+ */
+ public void targetFinished(BuildEvent event) {
+ Date start = (Date) profileData.remove(event.getTarget());
+ String name = "Target " + event.getTarget().getName();
+ logFinish(event, start, name);
+ }
+
+ /**
+ * Logs a message to say that the task has started.
+ *
+ * @param event
+ * An event with any relevant extra information. Must not be
+ * null.
+ */
+ public void taskStarted(BuildEvent event) {
+ String name = event.getTask().getTaskName();
+ Date now = new Date();
+ logStart(event, now, name);
+ profileData.put(event.getTask(), now);
+ }
+
+ /**
+ * Logs a message to say that the task has finished.
+ *
+ * @param event
+ * An event with any relevant extra information. Must not be
+ * null.
+ */
+ public void taskFinished(BuildEvent event) {
+ Date start = (Date) profileData.remove(event.getTask());
+ String name = event.getTask().getTaskName();
+ logFinish(event, start, name);
+ }
+
+ private void logFinish(BuildEvent event, Date start, String name) {
+ Date now = new Date();
+ String msg = null;
+ if (start != null) {
+ long diff = now.getTime() - start.getTime();
+ msg = StringUtils.LINE_SEP + name + ": finished" + now + " ("
+ + diff + "ms)";
+ } else {
+ msg = StringUtils.LINE_SEP + name + ": finished" + now
+ + " (unknown duration, start not detected)";
+ }
+ printMessage(msg, out, event.getPriority());
+ log(msg);
+ }
+
+ private void logStart(BuildEvent event, Date start, String name) {
+ String msg = StringUtils.LINE_SEP + name + ": started " + start;
+ printMessage(msg, out, event.getPriority());
+ log(msg);
+ }
+
+}
diff --git a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
index 3aca2f748..1b1b03019 100644
--- a/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/HostInfo.java
@@ -1,247 +1,247 @@
-/*
- * 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.
- *
- */
-
-package org.apache.tools.ant.taskdefs;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * Sets properties to the host provided, or localhost if no information is
- * provided. The default properties are NAME, FQDN, ADDR4, ADDR6;
- *
- * @since Ant 1.8
- * @ant.task category="utility"
- */
-
-
-public class HostInfo extends Task {
- private static final String DEF_REM_ADDR6 = "::";
-
- private static final String DEF_REM_ADDR4 = "0.0.0.0";
-
- private static final String DEF_LOCAL_ADDR6 = "::1";
-
- private static final String DEF_LOCAL_ADDR4 = "127.0.0.1";
-
- private static final String DEF_LOCAL_NAME = "localhost";
- private static final String DEF_DOMAIN = "localdomain";
-
- private static final String DOMAIN = "DOMAIN";
-
- private static final String NAME = "NAME";
-
- private static final String ADDR4 = "ADDR4";
-
- private static final String ADDR6 = "ADDR6";
-
- private String prefix = "";
-
- private String host;
-
- private InetAddress nameAddr;
-
- private InetAddress best6;
-
- private InetAddress best4;
-
- private List inetAddrs;
-
- /**
- * Set a prefix for the properties. If the prefix does not end with a "."
- * one is automatically added.
- *
- * @param aPrefix
- * the prefix to use.
- * @since Ant 1.8
- */
- public void setPrefix(String aPrefix) {
- prefix = aPrefix;
- if (!prefix.endsWith(".")) {
- prefix += ".";
- }
- }
-
- /**
- * Set the host to be retrieved.
- *
- * @param aHost
- * the name or the address of the host, data for the local host
- * will be retrieved if ommited.
- * @since Ant 1.8
- */
- public void setHost(String aHost) {
- host = aHost;
- }
-
- /**
- * set the properties.
- *
- * @throws BuildException
- * on error.
- */
- public void execute() throws BuildException {
- if (host == null || "".equals(host)) {
- executeLocal();
- } else {
- executeRemote();
- }
- }
-
- private void executeLocal() {
- try {
- Enumeration interfaces = NetworkInterface.getNetworkInterfaces();
- inetAddrs = new LinkedList();
- while (interfaces.hasMoreElements()) {
- NetworkInterface currentif = (NetworkInterface) interfaces
- .nextElement();
- Enumeration addrs = currentif.getInetAddresses();
- while (addrs.hasMoreElements())
- {
- inetAddrs.add(addrs.nextElement());
- }
- }
- selectAddresses();
-
- if (nameAddr != null) {
- setDomainAndName(nameAddr.getCanonicalHostName());
- } else {
- setProperty(DOMAIN, DEF_DOMAIN);
- setProperty(NAME, DEF_LOCAL_NAME);
- }
- if (best4 != null) {
- setProperty(ADDR4, best4.getHostAddress());
- } else {
- setProperty(ADDR4, DEF_LOCAL_ADDR4);
- }
- if (best6 != null) {
- setProperty(ADDR6, best6.getHostAddress());
- } else {
- setProperty(ADDR6, DEF_LOCAL_ADDR6);
- }
- } catch (Exception e) {
- log("Error retrieving local host information", e, Project.MSG_WARN);
- setProperty(DOMAIN, DEF_DOMAIN);
- setProperty(NAME, DEF_LOCAL_NAME);
- setProperty(ADDR4, DEF_LOCAL_ADDR4);
- setProperty(ADDR6, DEF_LOCAL_ADDR6);
- }
- }
-
- private void selectAddresses() {
- Iterator i = inetAddrs.iterator();
- while (i.hasNext()) {
- InetAddress current = (InetAddress) i.next();
- if (!current.isMulticastAddress()) {
- if (current instanceof Inet4Address) {
- best4 = selectBestAddress(best4, current);
- } else if (current instanceof Inet6Address) {
- best6 = selectBestAddress(best6, current);
- }
- }
- }
-
- nameAddr = selectBestAddress(best6, best4);
- }
-
- private InetAddress selectBestAddress(InetAddress bestSoFar,
- InetAddress current) {
- InetAddress best = bestSoFar;
- if (best == null) {
- // none selected so far, so this one is better.
- best = current;
- } else {
- if (current.isLoopbackAddress()) {
- // definitely not better than the previously selected address.
- } else if (current.isLinkLocalAddress()) {
- // link local considered better than loopback
- if (best.isLoopbackAddress()) {
- best = current;
- }
- } else if (current.isSiteLocalAddress()) {
- // site local considered better than link local (and loopback)
- if (best.isLoopbackAddress() || best.isLinkLocalAddress()) {
- best = current;
- }
- } else {
- // current is a global address, and therefore best (at least
- // equally well)
- best = current;
- }
- }
- return best;
- }
-
- private void executeRemote() {
- try {
- inetAddrs = Arrays.asList(InetAddress.getAllByName(host));
-
- selectAddresses();
-
- if (nameAddr != null) {
- setDomainAndName(nameAddr.getCanonicalHostName());
- } else {
- setDomainAndName(host);
- }
- if (best4 != null) {
- setProperty(ADDR4, best4.getHostAddress());
- } else {
- setProperty(ADDR4, DEF_REM_ADDR4);
- }
- if (best6 != null) {
- setProperty(ADDR6, best6.getHostAddress());
- } else {
- setProperty(ADDR6, DEF_REM_ADDR6);
- }
- } catch (Exception e) {
- log("Error retrieving remote host information for host:" + host
- + ".", e, Project.MSG_WARN);
- setDomainAndName(host);
- setProperty(ADDR4, DEF_REM_ADDR4);
- setProperty(ADDR6, DEF_REM_ADDR6);
- }
- }
-
- private void setDomainAndName(String fqdn)
- {
- int idx = fqdn.indexOf('.');
- if (idx > 0) {
- setProperty(NAME, fqdn.substring(0, idx));
- setProperty(DOMAIN, fqdn.substring(idx+1));
- } else {
- setProperty(NAME, fqdn);
- setProperty(DOMAIN, DEF_DOMAIN);
- }
- }
-
- private void setProperty(String name, String value) {
- getProject().setNewProperty(prefix + name, value);
- }
-
-}
+/*
+ * 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.
+ *
+ */
+
+package org.apache.tools.ant.taskdefs;
+
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+ * Sets properties to the host provided, or localhost if no information is
+ * provided. The default properties are NAME, FQDN, ADDR4, ADDR6;
+ *
+ * @since Ant 1.8
+ * @ant.task category="utility"
+ */
+
+
+public class HostInfo extends Task {
+ private static final String DEF_REM_ADDR6 = "::";
+
+ private static final String DEF_REM_ADDR4 = "0.0.0.0";
+
+ private static final String DEF_LOCAL_ADDR6 = "::1";
+
+ private static final String DEF_LOCAL_ADDR4 = "127.0.0.1";
+
+ private static final String DEF_LOCAL_NAME = "localhost";
+ private static final String DEF_DOMAIN = "localdomain";
+
+ private static final String DOMAIN = "DOMAIN";
+
+ private static final String NAME = "NAME";
+
+ private static final String ADDR4 = "ADDR4";
+
+ private static final String ADDR6 = "ADDR6";
+
+ private String prefix = "";
+
+ private String host;
+
+ private InetAddress nameAddr;
+
+ private InetAddress best6;
+
+ private InetAddress best4;
+
+ private List inetAddrs;
+
+ /**
+ * Set a prefix for the properties. If the prefix does not end with a "."
+ * one is automatically added.
+ *
+ * @param aPrefix
+ * the prefix to use.
+ * @since Ant 1.8
+ */
+ public void setPrefix(String aPrefix) {
+ prefix = aPrefix;
+ if (!prefix.endsWith(".")) {
+ prefix += ".";
+ }
+ }
+
+ /**
+ * Set the host to be retrieved.
+ *
+ * @param aHost
+ * the name or the address of the host, data for the local host
+ * will be retrieved if ommited.
+ * @since Ant 1.8
+ */
+ public void setHost(String aHost) {
+ host = aHost;
+ }
+
+ /**
+ * set the properties.
+ *
+ * @throws BuildException
+ * on error.
+ */
+ public void execute() throws BuildException {
+ if (host == null || "".equals(host)) {
+ executeLocal();
+ } else {
+ executeRemote();
+ }
+ }
+
+ private void executeLocal() {
+ try {
+ Enumeration interfaces = NetworkInterface.getNetworkInterfaces();
+ inetAddrs = new LinkedList();
+ while (interfaces.hasMoreElements()) {
+ NetworkInterface currentif = (NetworkInterface) interfaces
+ .nextElement();
+ Enumeration addrs = currentif.getInetAddresses();
+ while (addrs.hasMoreElements())
+ {
+ inetAddrs.add(addrs.nextElement());
+ }
+ }
+ selectAddresses();
+
+ if (nameAddr != null) {
+ setDomainAndName(nameAddr.getCanonicalHostName());
+ } else {
+ setProperty(DOMAIN, DEF_DOMAIN);
+ setProperty(NAME, DEF_LOCAL_NAME);
+ }
+ if (best4 != null) {
+ setProperty(ADDR4, best4.getHostAddress());
+ } else {
+ setProperty(ADDR4, DEF_LOCAL_ADDR4);
+ }
+ if (best6 != null) {
+ setProperty(ADDR6, best6.getHostAddress());
+ } else {
+ setProperty(ADDR6, DEF_LOCAL_ADDR6);
+ }
+ } catch (Exception e) {
+ log("Error retrieving local host information", e, Project.MSG_WARN);
+ setProperty(DOMAIN, DEF_DOMAIN);
+ setProperty(NAME, DEF_LOCAL_NAME);
+ setProperty(ADDR4, DEF_LOCAL_ADDR4);
+ setProperty(ADDR6, DEF_LOCAL_ADDR6);
+ }
+ }
+
+ private void selectAddresses() {
+ Iterator i = inetAddrs.iterator();
+ while (i.hasNext()) {
+ InetAddress current = (InetAddress) i.next();
+ if (!current.isMulticastAddress()) {
+ if (current instanceof Inet4Address) {
+ best4 = selectBestAddress(best4, current);
+ } else if (current instanceof Inet6Address) {
+ best6 = selectBestAddress(best6, current);
+ }
+ }
+ }
+
+ nameAddr = selectBestAddress(best6, best4);
+ }
+
+ private InetAddress selectBestAddress(InetAddress bestSoFar,
+ InetAddress current) {
+ InetAddress best = bestSoFar;
+ if (best == null) {
+ // none selected so far, so this one is better.
+ best = current;
+ } else {
+ if (current.isLoopbackAddress()) {
+ // definitely not better than the previously selected address.
+ } else if (current.isLinkLocalAddress()) {
+ // link local considered better than loopback
+ if (best.isLoopbackAddress()) {
+ best = current;
+ }
+ } else if (current.isSiteLocalAddress()) {
+ // site local considered better than link local (and loopback)
+ if (best.isLoopbackAddress() || best.isLinkLocalAddress()) {
+ best = current;
+ }
+ } else {
+ // current is a global address, and therefore best (at least
+ // equally well)
+ best = current;
+ }
+ }
+ return best;
+ }
+
+ private void executeRemote() {
+ try {
+ inetAddrs = Arrays.asList(InetAddress.getAllByName(host));
+
+ selectAddresses();
+
+ if (nameAddr != null) {
+ setDomainAndName(nameAddr.getCanonicalHostName());
+ } else {
+ setDomainAndName(host);
+ }
+ if (best4 != null) {
+ setProperty(ADDR4, best4.getHostAddress());
+ } else {
+ setProperty(ADDR4, DEF_REM_ADDR4);
+ }
+ if (best6 != null) {
+ setProperty(ADDR6, best6.getHostAddress());
+ } else {
+ setProperty(ADDR6, DEF_REM_ADDR6);
+ }
+ } catch (Exception e) {
+ log("Error retrieving remote host information for host:" + host
+ + ".", e, Project.MSG_WARN);
+ setDomainAndName(host);
+ setProperty(ADDR4, DEF_REM_ADDR4);
+ setProperty(ADDR6, DEF_REM_ADDR6);
+ }
+ }
+
+ private void setDomainAndName(String fqdn)
+ {
+ int idx = fqdn.indexOf('.');
+ if (idx > 0) {
+ setProperty(NAME, fqdn.substring(0, idx));
+ setProperty(DOMAIN, fqdn.substring(idx+1));
+ } else {
+ setProperty(NAME, fqdn);
+ setProperty(DOMAIN, DEF_DOMAIN);
+ }
+ }
+
+ private void setProperty(String name, String value) {
+ getProject().setNewProperty(prefix + name, value);
+ }
+
+}
diff --git a/src/main/org/apache/tools/ant/taskdefs/Retry.java b/src/main/org/apache/tools/ant/taskdefs/Retry.java
index 200259e16..ece55a025 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Retry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Retry.java
@@ -1,89 +1,89 @@
-/*
- * 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.
- *
- */
-package org.apache.tools.ant.taskdefs;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.TaskContainer;
-import org.apache.tools.ant.util.StringUtils;
-
-/**
- * Retries the nested task a set number of times
- * @since Ant 1.7.1
- */
-public class Retry extends Task implements TaskContainer {
-
- /**
- * task to execute n times
- */
- private Task nestedTask;
-
- /**
- * set retryCount to 1 by default
- */
- private int retryCount = 1;
-
- /**
- * set the task
- * @param t the task to retry.
- */
- public synchronized void addTask(Task t) {
- if (nestedTask != null) {
- throw new BuildException(
- "The retry task container accepts a single nested task"
- + " (which may be a sequential task container)");
- }
- nestedTask = t;
- }
-
- /**
- * set the number of times to retry the task
- * @param n the number to use.
- */
- public void setRetryCount(int n) {
- retryCount = n;
- }
-
- /**
- * perform the work
- * @throws BuildException if there is an error.
- */
- public void execute() throws BuildException {
- StringBuffer errorMessages = new StringBuffer();
- for (int i = 0; i <= retryCount; i++) {
- try {
- nestedTask.perform();
- break;
- } catch (Exception e) {
- errorMessages.append(e.getMessage());
- if (i >= retryCount) {
- StringBuffer exceptionMessage = new StringBuffer();
- exceptionMessage.append("Task [").append(nestedTask.getTaskName());
- exceptionMessage.append("] failed after [").append(retryCount);
- exceptionMessage.append("] attempts; giving up.").append(StringUtils.LINE_SEP);
- exceptionMessage.append("Error messages:").append(StringUtils.LINE_SEP);
- exceptionMessage.append(errorMessages);
- throw new BuildException(exceptionMessage.toString(), getLocation());
- }
- log("Attempt [" + i + "]: error occurred; retrying...", e, Project.MSG_INFO);
- errorMessages.append(StringUtils.LINE_SEP);
- }
- }
- }
+/*
+ * 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.
+ *
+ */
+package org.apache.tools.ant.taskdefs;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.TaskContainer;
+import org.apache.tools.ant.util.StringUtils;
+
+/**
+ * Retries the nested task a set number of times
+ * @since Ant 1.7.1
+ */
+public class Retry extends Task implements TaskContainer {
+
+ /**
+ * task to execute n times
+ */
+ private Task nestedTask;
+
+ /**
+ * set retryCount to 1 by default
+ */
+ private int retryCount = 1;
+
+ /**
+ * set the task
+ * @param t the task to retry.
+ */
+ public synchronized void addTask(Task t) {
+ if (nestedTask != null) {
+ throw new BuildException(
+ "The retry task container accepts a single nested task"
+ + " (which may be a sequential task container)");
+ }
+ nestedTask = t;
+ }
+
+ /**
+ * set the number of times to retry the task
+ * @param n the number to use.
+ */
+ public void setRetryCount(int n) {
+ retryCount = n;
+ }
+
+ /**
+ * perform the work
+ * @throws BuildException if there is an error.
+ */
+ public void execute() throws BuildException {
+ StringBuffer errorMessages = new StringBuffer();
+ for (int i = 0; i <= retryCount; i++) {
+ try {
+ nestedTask.perform();
+ break;
+ } catch (Exception e) {
+ errorMessages.append(e.getMessage());
+ if (i >= retryCount) {
+ StringBuffer exceptionMessage = new StringBuffer();
+ exceptionMessage.append("Task [").append(nestedTask.getTaskName());
+ exceptionMessage.append("] failed after [").append(retryCount);
+ exceptionMessage.append("] attempts; giving up.").append(StringUtils.LINE_SEP);
+ exceptionMessage.append("Error messages:").append(StringUtils.LINE_SEP);
+ exceptionMessage.append(errorMessages);
+ throw new BuildException(exceptionMessage.toString(), getLocation());
+ }
+ log("Attempt [" + i + "]: error occurred; retrying...", e, Project.MSG_INFO);
+ errorMessages.append(StringUtils.LINE_SEP);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java b/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
index 7afe87f26..420c18946 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.java
@@ -1,101 +1,101 @@
-/*
- * 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.
- *
- */
-
-package org.apache.tools.ant.taskdefs.condition;
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.JavaEnvUtils;
-import org.apache.tools.ant.util.ReflectWrapper;
-import org.apache.tools.ant.util.StringUtils;
-
-/**
- * <hasfreespace>
- * Condition returns true if selected partition - * has the requested space, false otherwise.
- * @since Ant 1.7 - */ -public class HasFreeSpace implements Condition { - - private String partition; - private String needed; - - /** - * Evaluate the condition. - * @return true if there enough free space. - * @throws BuildException if there is a problem. - */ - public boolean eval() throws BuildException { - validate(); - try { - if (JavaEnvUtils.isAtLeastJavaVersion("1.6")) { - //reflection to avoid bootstrap/build problems - File fs = new File(partition); - ReflectWrapper w = new ReflectWrapper(fs); - long free = ((Long) w.invoke("getFreeSpace")).longValue(); - return free >= StringUtils.parseHumanSizes(needed); - } else { - throw new BuildException("HasFreeSpace condition not supported on Java5 or less."); - } - } catch (Exception e) { - throw new BuildException(e); - } - } - - private void validate() throws BuildException { - if (null == partition) { - throw new BuildException("Please set the partition attribute."); - } - if (null == needed) { - throw new BuildException("Please set the needed attribute."); - } - } - - /** - * The partition/device to check - * @return the partition. - */ - public String getPartition() { - return partition; - } - - /** - * Set the partition name. - * @param partition the name to use. - */ - public void setPartition(String partition) { - this.partition = partition; - } - - /** - * The amount of free space required - * @return the amount required - */ - public String getNeeded() { - return needed; - } - - /** - * Set the amount of space required. - * @param needed the amount required. - */ - public void setNeeded(String needed) { - this.needed = needed; - } -} +/* + * 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. + * + */ + +package org.apache.tools.ant.taskdefs.condition; + +import java.io.File; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.JavaEnvUtils; +import org.apache.tools.ant.util.ReflectWrapper; +import org.apache.tools.ant.util.StringUtils; + +/** + * <hasfreespace> + *Condition returns true if selected partition + * has the requested space, false otherwise.
+ * @since Ant 1.7 + */ +public class HasFreeSpace implements Condition { + + private String partition; + private String needed; + + /** + * Evaluate the condition. + * @return true if there enough free space. + * @throws BuildException if there is a problem. + */ + public boolean eval() throws BuildException { + validate(); + try { + if (JavaEnvUtils.isAtLeastJavaVersion("1.6")) { + //reflection to avoid bootstrap/build problems + File fs = new File(partition); + ReflectWrapper w = new ReflectWrapper(fs); + long free = ((Long) w.invoke("getFreeSpace")).longValue(); + return free >= StringUtils.parseHumanSizes(needed); + } else { + throw new BuildException("HasFreeSpace condition not supported on Java5 or less."); + } + } catch (Exception e) { + throw new BuildException(e); + } + } + + private void validate() throws BuildException { + if (null == partition) { + throw new BuildException("Please set the partition attribute."); + } + if (null == needed) { + throw new BuildException("Please set the needed attribute."); + } + } + + /** + * The partition/device to check + * @return the partition. + */ + public String getPartition() { + return partition; + } + + /** + * Set the partition name. + * @param partition the name to use. + */ + public void setPartition(String partition) { + this.partition = partition; + } + + /** + * The amount of free space required + * @return the amount required + */ + public String getNeeded() { + return needed; + } + + /** + * Set the amount of space required. + * @param needed the amount required. + */ + public void setNeeded(String needed) { + this.needed = needed; + } +} diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java index f636ad063..76a9ad35d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/ResourceContains.java @@ -1,165 +1,165 @@ -/* - * 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. - * - */ -package org.apache.tools.ant.taskdefs.condition; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.types.Resource; -import org.apache.tools.ant.types.ResourceCollection; -import org.apache.tools.ant.types.resources.FileResource; -import org.apache.tools.ant.util.FileUtils; - -/** - * <resourcecontains> - * Is a string contained in a resource (file currently)? - * @since Ant 1.7.1 - */ -public class ResourceContains implements Condition { - - private Project project; - private String substring; - private Resource resource; - private String refid; - private boolean casesensitive = true; - - /** - * Set this condition's Project. - * @param project Project - */ - public void setProject(Project project) { - this.project = project; - } - - /** - * Get this condition's Project. - * @return Project - */ - public Project getProject() { - return project; - } - - /** - * Sets the resource to search - * @param r the value to use. - */ - public void setResource(String r) { - this.resource = new FileResource(new File(r)); - } - - /** - * Sets the refid to search; should indicate a resource directly - * or by way of a single-element ResourceCollection. - * @param refid the value to use. - */ - public void setRefid(String refid) { - this.refid = refid; - } - - private void resolveRefid() { - try { - if (getProject() == null) { - throw new BuildException("Cannot retrieve refid; project unset"); - } - Object o = getProject().getReference(refid); - if (!(o instanceof Resource)) { - if (o instanceof ResourceCollection) { - ResourceCollection rc = (ResourceCollection) o; - if (rc.size() == 1) { - o = rc.iterator().next(); - } - } else { - throw new BuildException( - "Illegal value at '" + refid + "': " + String.valueOf(o)); - } - } - this.resource = (Resource) o; - } finally { - refid = null; - } - } - - /** - * Sets the substring to look for - * @param substring the value to use. - */ - public void setSubstring(String substring) { - this.substring = substring; - } - - /** - * Sets case sensitivity attribute. - * @param casesensitive the value to use. - */ - public void setCasesensitive(boolean casesensitive) { - this.casesensitive = casesensitive; - } - - private void validate() { - if (resource != null && refid != null) { - throw new BuildException("Cannot set both resource and refid"); - } - if (resource == null && refid != null) { - resolveRefid(); - } - if (resource == null || substring == null) { - throw new BuildException("both resource and substring are required " - + "inCollects all failing test cases and creates a new JUnit test class containing - * a suite() method which calls these failed tests.
- *Having classes A ... D with each several testcases you could earn a new - * test class like - *
- * // generated on: 2007.08.06 09:42:34,555
- * import junit.framework.*;
- * public class FailedTests extends TestCase {
- * public FailedTests(String testname) {
- * super(testname);
- * }
- * public static Test suite() {
- * TestSuite suite = new TestSuite();
- * suite.addTest( new B("test04") );
- * suite.addTest( new org.D("test10") );
- * return suite;
- * }
- * }
- *
- *
- * Because each running test case gets its own formatter, we collect
- * the failing test cases in a static list. Because we dont have a finalizer
- * method in the formatters "lifecycle", we register this formatter as
- * BuildListener and generate the new java source on taskFinished event.
- *
- * @since Ant 1.8.0
- */
-public class FailureRecorder extends ProjectComponent implements JUnitResultFormatter, BuildListener {
-
- /**
- * This is the name of a magic System property ({@value}). The value of this
- * System property should point to the location where to store the
- * generated class (without suffix).
- * Default location and name is defined in DEFAULT_CLASS_LOCATION.
- * @see #DEFAULT_CLASS_LOCATION
- */
- public static final String MAGIC_PROPERTY_CLASS_LOCATION
- = "ant.junit.failureCollector";
-
- /** Default location and name for the generated JUnit class file. {@value} */
- public static final String DEFAULT_CLASS_LOCATION
- = System.getProperty("java.io.tmpdir") + "FailedTests";
-
- /** Prefix for logging. {@value} */
- private static final String LOG_PREFIX = " [junit]";
-
- /** Class names of failed tests without duplicates. */
- private static SortedSet/*Collects all failing test cases and creates a new JUnit test class containing + * a suite() method which calls these failed tests.
+ *Having classes A ... D with each several testcases you could earn a new + * test class like + *
+ * // generated on: 2007.08.06 09:42:34,555
+ * import junit.framework.*;
+ * public class FailedTests extends TestCase {
+ * public FailedTests(String testname) {
+ * super(testname);
+ * }
+ * public static Test suite() {
+ * TestSuite suite = new TestSuite();
+ * suite.addTest( new B("test04") );
+ * suite.addTest( new org.D("test10") );
+ * return suite;
+ * }
+ * }
+ *
+ *
+ * Because each running test case gets its own formatter, we collect
+ * the failing test cases in a static list. Because we dont have a finalizer
+ * method in the formatters "lifecycle", we register this formatter as
+ * BuildListener and generate the new java source on taskFinished event.
+ *
+ * @since Ant 1.8.0
+ */
+public class FailureRecorder extends ProjectComponent implements JUnitResultFormatter, BuildListener {
+
+ /**
+ * This is the name of a magic System property ({@value}). The value of this
+ * System property should point to the location where to store the
+ * generated class (without suffix).
+ * Default location and name is defined in DEFAULT_CLASS_LOCATION.
+ * @see #DEFAULT_CLASS_LOCATION
+ */
+ public static final String MAGIC_PROPERTY_CLASS_LOCATION
+ = "ant.junit.failureCollector";
+
+ /** Default location and name for the generated JUnit class file. {@value} */
+ public static final String DEFAULT_CLASS_LOCATION
+ = System.getProperty("java.io.tmpdir") + "FailedTests";
+
+ /** Prefix for logging. {@value} */
+ private static final String LOG_PREFIX = " [junit]";
+
+ /** Class names of failed tests without duplicates. */
+ private static SortedSet/*