jvanzyl 02/02/12 13:48:03
Modified: src/tdk/task/org/apache/tdk Get.java
Log:
- collect all the warnings about non-distributability at the end so
the user can actually see them.
Revision Changes Path
1.6 +22 -2 jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/Get.java
Index: Get.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/task/org/apache/tdk/Get.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Get.java 12 Feb 2002 21:30:05 -0000 1.5
+++ Get.java 12 Feb 2002 21:48:03 -0000 1.6
@@ -81,7 +81,9 @@
* @author [EMAIL PROTECTED]
* @author [EMAIL PROTECTED] (Added Java 1.1 style HTTP basic auth)
*/
-public class Get extends Task {
+public class Get
+ extends Task
+{
private URL source; // required
private File dest; // required
private boolean verbose = false;
@@ -92,6 +94,7 @@
private String baseUrl;
private File dependencyFile;
+ private StringBuffer warnings = new StringBuffer();
private List fileLinesToList(File f)
{
@@ -114,9 +117,21 @@
if (line.startsWith("<non-distributable>"))
{
- String entry[] = StringUtil.split(line,":",-1);
+ String entry[] = StringUtil.split(line,"|",-1);
String jar = entry[1];
String location = entry[2];
+
+
warnings.append("-------------------------------------------------\n");
+ warnings.append("W A R N I N G\n");
+
warnings.append("------------------------------------------------\n");
+ warnings.append("The following JAR must be downloaded
manually:\n");
+ warnings.append(jar + "\n");
+ warnings.append("\n");
+ warnings.append("You can find the JAR here:\n");
+ warnings.append(location + "\n");
+ warnings.append("\n");
+
+ continue;
}
l.add(line);
@@ -339,6 +354,11 @@
e.printStackTrace();
}
}
+
+ if (warnings.length() > 1)
+ {
+ log("\n"+warnings.toString());
+ }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
