svn commit: r1513410 - in /jmeter/trunk/src: jorphan/org/apache/jorphan/exec/ protocol/native/org/apache/jmeter/protocol/system/

[se...@apache.org]

Author: sebb
Date: Tue Aug 13 09:45:36 2013
New Revision: 1513410

URL: http://svn.apache.org/r1513410
Log:
NativeCommand could be useful elsewhere
Deprecate original class
Rename new class to avoid confusion
Bugzilla Id: 55411

Added:
    jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
      - copied, changed from r1513407, jmeter/trunk/src/jorphan/org/apache/jorphan/exec/NativeCommand.java
Removed:
    jmeter/trunk/src/jorphan/org/apache/jorphan/exec/NativeCommand.java
Modified:
    jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java
    jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java

Copied: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java (from r1513407, jmeter/trunk/src/jorphan/org/apache/jorphan/exec/NativeCommand.java)
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java?p2=jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java&p1=jmeter/trunk/src/jorphan/org/apache/jorphan/exec/NativeCommand.java&r1=1513407&r2=1513410&rev=1513410&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/NativeCommand.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java Tue Aug 13 09:45:36 2013
@@ -29,9 +29,9 @@ import java.util.Map;
 import org.apache.jorphan.util.JOrphanUtils;
 
 /**
- * Native Command 
+ * Utility class for invoking native system applications
  */
-public class NativeCommand {
+public class SystemCommand {
 
     private StreamGobbler outputGobbler;
     private final File directory;
@@ -45,7 +45,7 @@ public class NativeCommand {
      * @param env Environment variables appended to environment
      * @param directory File working directory
      */
-    public NativeCommand(File directory, Map<String, String> env) {
+    public SystemCommand(File directory, Map<String, String> env) {
         this(directory, env, null, null, null);
     }
 
@@ -57,7 +57,7 @@ public class NativeCommand {
      * @param stdout File name that will contain out stream
      * @param stderr File name that will contain err stream
      */
-    public NativeCommand(File directory, Map<String, String> env, String stdin, String stdout, String stderr) {
+    public SystemCommand(File directory, Map<String, String> env, String stdin, String stdout, String stderr) {
         super();
         this.directory = directory;
         this.env = env;

Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java?rev=1513410&r1=1513409&r2=1513410&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java (original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/NativeCommand.java Tue Aug 13 09:45:36 2013
@@ -22,9 +22,11 @@ import java.io.File;
 import java.util.Map;
 
 /**
- * Native Command 
+ * Native Command
+ * @deprecated (2.10) use {@link org.apache.jorphan.exec.SystemCommand} instead
  */
-public class NativeCommand extends  org.apache.jorphan.exec.NativeCommand {
+@Deprecated
+public class NativeCommand extends  org.apache.jorphan.exec.SystemCommand {
 
     /**
      * @param env Environment variables appended to environment

Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java?rev=1513410&r1=1513409&r2=1513410&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java (original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java Tue Aug 13 09:45:36 2013
@@ -38,6 +38,7 @@ import org.apache.jmeter.samplers.Sample
 import org.apache.jmeter.services.FileServer;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.TestElementProperty;
+import org.apache.jorphan.exec.SystemCommand;
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 
@@ -138,7 +139,7 @@ public class SystemSampler extends Abstr
                     ", Environment:"+env+
                     ", Executing:" + cmdLine.toString());
             
-            NativeCommand nativeCommand = new NativeCommand(directory, env, getStdin(), getStdout(), getStderr());
+            SystemCommand nativeCommand = new SystemCommand(directory, env, getStdin(), getStdout(), getStderr());
             
             String responseData = null;
             try {