conor 2003/02/16 05:59:15
Modified: src/main/org/apache/tools/ant/taskdefs/optional Tag:
ANT_15_BRANCH PropertyFile.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.21.2.5 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
Index: PropertyFile.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -w -u -r1.21.2.4 -r1.21.2.5
--- PropertyFile.java 10 Feb 2003 14:24:59 -0000 1.21.2.4
+++ PropertyFile.java 16 Feb 2003 13:59:15 -0000 1.21.2.5
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -541,8 +541,8 @@
+ "properties (key:" + key + ")");
}
if (value == null && defaultValue == null) {
- throw new BuildException("value and/or default must be "
- + "specified (key:" + key + ")");
+ throw new BuildException("\"value\" and/or \"default\" "
+ + "attribute must be specified (key:" + key + ")");
}
if (key == null) {
throw new BuildException("key is mandatory");
