diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-07-28 12:30:16 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-07-28 12:30:16 +0200 |
| commit | 1028dee4dfcd89e914d66d4fe92aaa8fcfbfd494 (patch) | |
| tree | f3c7fec136ab12f74639b0d95426e743cdb2dfcd /src/main/java/com/c2kernel/process | |
| parent | f37883c23f9032ace7e0e780fa0e641859863c0c (diff) | |
Support pre-compilation of scripts if supported by the engine. Also does
this during testing to catch script syntax errors during build. Client
shell detects these error and declares them pre-execution.
Conflicts:
src/main/java/com/c2kernel/scripting/Script.java
src/test/java/MainTest.java
Diffstat (limited to 'src/main/java/com/c2kernel/process')
| -rw-r--r-- | src/main/java/com/c2kernel/process/ClientShell.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java index 9f1d3ab..eeeb07f 100644 --- a/src/main/java/com/c2kernel/process/ClientShell.java +++ b/src/main/java/com/c2kernel/process/ClientShell.java @@ -5,6 +5,7 @@ import java.util.Scanner; import com.c2kernel.entity.proxy.AgentProxy;
import com.c2kernel.process.auth.ProxyLogin;
import com.c2kernel.scripting.Script;
+import com.c2kernel.scripting.ScriptParsingException;
public class ClientShell extends StandardClient {
@@ -21,13 +22,15 @@ public class ClientShell extends StandardClient { System.out.print("> ");
while (scan.hasNextLine()) {
String command = scan.nextLine();
- console.setScript(command);
try {
+ console.setScript(command);
Object response = console.execute();
if (response == null)
System.out.println("Ok");
else
System.out.println(response);
+ } catch (ScriptParsingException e) {
+ System.err.println("Syntax error: "+e.getMessage());
} catch (Throwable ex) {
ex.printStackTrace();
}
|
