lcsim/src/org/lcsim/job
diff -u -r1.19 -r1.20
--- JobControlManager.java 17 Mar 2009 22:04:11 -0000 1.19
+++ JobControlManager.java 24 Aug 2009 22:20:18 -0000 1.20
@@ -24,7 +24,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Scanner;
import java.util.StringTokenizer;
import java.util.Map.Entry;
@@ -67,6 +66,7 @@
boolean printSystemProperties;
boolean printUserClassPath;
boolean printDriversDetailed;
+ boolean printVersion;
boolean verbose;
boolean wasSetup;
PrintStream logStream = System.out;
@@ -107,6 +107,12 @@
if (!wasSetup)
throw new RuntimeException("Aborting job! The setup() method was never called.");
+ if (printVersion)
+ {
+ (new LCSimVersion()).printOut(logStream);
+ logStream.println();
+ }
+
if (printSystemProperties)
printSystemProperties(logStream);
@@ -458,10 +464,6 @@
}
}
- // Print the lcsim version info to the log (always).
- (new LCSimVersion()).printOut(logStream);
- logStream.println();
-
// Print hello world message to appear at top of log.
if (verbose)
{
@@ -532,6 +534,12 @@
if (verbose)
logStream.println("printUserClassPath = " + printUserClassPath);
+
+ Element printVersionElement = control.getChild("printVersion");
+ if (printVersionElement != null)
+ {
+ printVersion = Boolean.valueOf(printVersionElement.getText());
+ }
Element printDriversDetailedElement = control.getChild("printDriversDetailed");
if (printDriversDetailedElement != null)
@@ -541,7 +549,7 @@
{
logStream.println("printDriversDetailed = " + printDriversDetailed);
logStream.println("--- End Job Control Parameters ---");
- logStream.println();
+ logStream.println();
}
}
}