svn commit: r1241484 - in /openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command: ScriptCommand.java ScriptFileCommand.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Feb  7 15:15:20 2012
New Revision: 1241484

URL: http://svn.apache.org/viewvc?rev=1241484&view=rev
Log:
fixing script command parsing in common cli

Modified:
    openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java
    openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptFileCommand.java

Modified: openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java?rev=1241484&r1=1241483&r2=1241484&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptCommand.java Tue Feb  7 15:15:20 2012
@@ -35,7 +35,7 @@ public class ScriptCommand extends Abstr
         }
     }
 
-    protected void parse(final String cmd) {
+    private void parse(final String cmd) {
         final String parseableCmd = cmd.substring(7);
         final int spaceIdx = parseableCmd.indexOf(" ");
         if (spaceIdx < 0) {

Modified: openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptFileCommand.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptFileCommand.java?rev=1241484&r1=1241483&r2=1241484&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptFileCommand.java (original)
+++ openejb/trunk/openejb/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ScriptFileCommand.java Tue Feb  7 15:15:20 2012
@@ -32,7 +32,7 @@ public class ScriptFileCommand extends S
             return;
         }
 
-        final File file = new File(script.trim());
+        final File file = new File(script);
         if (!file.exists()) {
             streamManager.writeErr("script file " + file.getPath() + " doesn't exist");
             return;
@@ -67,14 +67,12 @@ public class ScriptFileCommand extends S
         super.execute(builder.toString());
     }
 
-    @Override
-    protected void parse(final String cmd) {
-        final String parseableCmd = cmd.substring(7);
-        final int dotIdx = parseableCmd.lastIndexOf(".");
+    private void parse(final String cmd) {
+        script = cmd.substring(12);
+        final int dotIdx = script.lastIndexOf(".");
         if (dotIdx < 0) {
             throw new IllegalArgumentException("bad syntax, see help");
         }
-        script = parseableCmd.substring(0, dotIdx);
-        language = parseableCmd.substring(dotIdx, parseableCmd.length());
+        language = script.substring(dotIdx + 1, script.length());
     }
 }