Author: peterreilly
Date: Wed Nov 8 13:54:45 2006
New Revision: 472657
URL: http://svn.apache.org/viewvc?view=rev&rev=472657
Log:
opps, allow tests to compile again
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java?view=diff&rev=472657&r1=472656&r2=472657
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Wed Nov
8 13:54:45 2006
@@ -83,7 +83,7 @@
public class FixCRLF extends MatchingTask implements ChainableReader {
- private static final String ERROR_FILE_AND_SRCDIR
+ public static final String ERROR_FILE_AND_SRCDIR
= "srcdir and file are mutually exclusive";
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java?view=diff&rev=472657&r1=472656&r2=472657
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java
Wed Nov 8 13:54:45 2006
@@ -65,11 +65,11 @@
/**
* Error when no hostname is defined
*/
- private static final String ERROR_NO_HOSTNAME = "No hostname defined";
+ public static final String ERROR_NO_HOSTNAME = "No hostname defined";
/**
* Error when invalid timeout value is defined
*/
- private static final String ERROR_BAD_TIMEOUT = "Invalid timeout value";
+ public static final String ERROR_BAD_TIMEOUT = "Invalid timeout value";
/**
* Unknown host message is seen.
*/
@@ -77,14 +77,19 @@
/**
* Network error message is seen.
*/
- private static final String ERROR_ON_NETWORK = "network error to ";
- private static final String ERROR_BOTH_TARGETS
+ public static final String ERROR_ON_NETWORK = "network error to ";
+ /** Error message when url and host are specified. */
+ public static final String ERROR_BOTH_TARGETS
= "Both url and host have been specified";
- private static final String MSG_NO_REACHABLE_TEST
+ /** Error message when no reachably test avail. */
+ public static final String MSG_NO_REACHABLE_TEST
= "cannot do a proper reachability test on this Java version";
- private static final String ERROR_BAD_URL = "Bad URL ";
- private static final String ERROR_NO_HOST_IN_URL = "No hostname in URL ";
- private static final String METHOD_NAME = "isReachable";
+ /** Error message when an invalid url is used. */
+ public static final String ERROR_BAD_URL = "Bad URL ";
+ /** Error message when no hostname in url. */
+ public static final String ERROR_NO_HOST_IN_URL = "No hostname in URL ";
+ /** The method name to look for in InetAddress */
+ public static final String METHOD_NAME = "isReachable";
/**
* Set the host to ping.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java?view=diff&rev=472657&r1=472656&r2=472657
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/condition/ParserSupports.java
Wed Nov 8 13:54:45 2006
@@ -35,18 +35,26 @@
private String feature;
private String property;
private String value;
- private static final String ERROR_BOTH_ATTRIBUTES =
+ // Error messages
+ /** error - combined attributes not allowed */
+ public static final String ERROR_BOTH_ATTRIBUTES =
"Property and feature attributes are exclusive";
- private static final String FEATURE = "feature";
- private static final String PROPERTY = "property";
+ /** feature */
+ public static final String FEATURE = "feature";
+ /** property */
+ public static final String PROPERTY = "property";
- private static final String NOT_RECOGNIZED =
+ /** error - not recognized */
+ public static final String NOT_RECOGNIZED =
" not recognized: ";
- private static final String NOT_SUPPORTED =
+ /** error - not supported */
+ public static final String NOT_SUPPORTED =
" not supported: ";
- private static final String ERROR_NO_ATTRIBUTES =
+ /** error - missing attribute */
+ public static final String ERROR_NO_ATTRIBUTES =
"Neither feature or property are set";
- private static final String ERROR_NO_VALUE =
+ /** error - no value */
+ public static final String ERROR_NO_VALUE =
"A value is needed when testing for property support";
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
