jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1380395 - in /jmeter/trunk: docs/images/screenshots/ src/core/org/apache/jmeter/resources/ src/protocol/native/org/apache/jmeter/protocol/system/gui/ xdocs/images/screenshots/ xdocs/usermanual/
Date Mon, 03 Sep 2012 23:01:03 GMT
Author: milamber
Date: Mon Sep  3 23:01:02 2012
New Revision: 1380395

URL: http://svn.apache.org/viewvc?rev=1380395&view=rev
Log:
UI improvements (blocs ordering, command to first position, add word 'working' directory,
and swing's elements placement in space)
Standard streams, i18n improvements and terms (see http://en.wikipedia.org/wiki/Standard_streams
and http://fr.wikipedia.org/wiki/Flux_standard)
Bugzilla Id: 53168

Modified:
    jmeter/trunk/docs/images/screenshots/os_process_sampler.png
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
    jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/docs/images/screenshots/os_process_sampler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/os_process_sampler.png?rev=1380395&r1=1380394&r2=1380395&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1380395&r1=1380394&r2=1380395&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Mon Sep  3 23:01:02
2012
@@ -94,7 +94,7 @@ analyze=Analyze Data File...
 anchor_modifier_title=HTML Link Parser
 appearance=Look and Feel
 argument_must_not_be_negative=The Argument must not be negative\!
-arguments_panel_title=OS Process Parameters
+arguments_panel_title=Command parameters
 assertion_assume_success=Ignore Status
 assertion_body_resp=Response Body
 assertion_code_resp=Response Code
@@ -161,7 +161,8 @@ close=Close
 column_delete_disallowed=Deleting this column is not permitted
 column_number=Column number of CSV file | next | *alias
 command_config_box_title=Command to Execute
-command_field_title=Command: 
+command_config_std_streams_title=Standard streams (files)
+command_field_title=Command:
 compare=Compare
 comparefilt=Compare filter
 comparison_differ_content=Responses differ in content
@@ -222,7 +223,7 @@ deltest=Deletion test
 deref=Dereference aliases
 description=Description
 detail=Detail
-directory_field_title=Directory:
+directory_field_title=Working directory:
 disable=Disable
 distribution_graph_title=Distribution Graph (alpha)
 distribution_note1=The graph will update every 10 samples
@@ -991,9 +992,9 @@ summary_report=Summary Report
 switch_controller_label=Switch Value
 switch_controller_title=Switch Controller
 system_sampler_title=OS Process Sampler
-system_sampler_stdin=File for "standard" input stream 
-system_sampler_stdout=File for "standard" output stream 
-system_sampler_stderr=File for "standard" error output stream 
+system_sampler_stdin=Standard input (stdin):
+system_sampler_stdout=Standard output (stdout):
+system_sampler_stderr=Standard error (stderr):
 table_visualizer_bytes=Bytes
 table_visualizer_sample_num=Sample #
 table_visualizer_sample_time=Sample Time(ms)

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1380395&r1=1380394&r2=1380395&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Mon Sep  3 23:01:02
2012
@@ -88,7 +88,7 @@ analyze=En train d'analyser le fichier d
 anchor_modifier_title=Analyseur de lien HTML
 appearance=Apparence
 argument_must_not_be_negative=L'argument ne peut pas \u00EAtre n\u00E9gatif \!
-arguments_panel_title=Param\u00E8tres du processus syst\u00E8me
+arguments_panel_title=Param\u00E8tres de commande
 assertion_assume_success=Ignorer le statut
 assertion_body_resp=Corps de r\u00E9ponse
 assertion_code_resp=Code de r\u00E9ponse
@@ -155,7 +155,8 @@ close=Fermer
 column_delete_disallowed=Supprimer cette colonne n'est pas possible
 column_number=Num\u00E9ro de colonne du fichier CSV | next | *alias
 command_config_box_title=Commande \u00E0 ex\u00E9cuter
-command_field_title=Commande \: 
+command_config_std_streams_title=Flux standard (fichiers)
+command_field_title=Commande \:
 compare=Comparaison
 comparefilt=Filtre de comparaison
 comparison_differ_content=Le contenu des r\u00E9ponses est diff\u00E9rent.
@@ -985,9 +986,9 @@ summary_report=Rapport consolid\u00E9
 switch_controller_label=Aller vers le num\u00E9ro d'\u00E9l\u00E9ment (ou nom) subordonn\u00E9
\:
 switch_controller_title=Contr\u00F4leur Aller \u00E0
 system_sampler_title=Appel de processus syst\u00E8me
-system_sampler_stdin=Nom du fichier contenant l'entr\u00E9e "standard" utilis\u00E9e par
le process
-system_sampler_stdout=Nom du fichier  contenant la sortie "standard"
-system_sampler_stderr=Nom du fichier contenant la sortie "standard" d'erreur
+system_sampler_stdin=Entr\u00E9e standard (stdin) \:
+system_sampler_stdout=Sortie standard (stdout) \:
+system_sampler_stderr=Erreur standard (stderr) \:
 table_visualizer_bytes=Octets
 table_visualizer_sample_num=Echantillon \#
 table_visualizer_sample_time=Temps (ms)

Modified: jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java?rev=1380395&r1=1380394&r2=1380395&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
(original)
+++ jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
Mon Sep  3 23:01:02 2012
@@ -54,9 +54,9 @@ public class SystemSamplerGui extends Ab
     
     private JCheckBox checkReturnCode;
     private JLabeledTextField desiredReturnCode;
-    private final FilePanelEntry stdin = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stdin"));
-    private final FilePanelEntry stdout = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stdout"));
-    private final FilePanelEntry stderr = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stderr"));
+    private final FilePanelEntry stdin = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stdin"));
// $NON-NLS-1$
+    private final FilePanelEntry stdout = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stdout"));
// $NON-NLS-1$
+    private final FilePanelEntry stderr = new FilePanelEntry(JMeterUtils.getResString("system_sampler_stderr"));
// $NON-NLS-1$
     private JLabeledTextField directory;
     private JLabeledTextField command;
     private ArgumentsPanel argsPanel;
@@ -71,7 +71,7 @@ public class SystemSamplerGui extends Ab
     }
 
     public String getLabelResource() {
-        return "system_sampler_title";
+        return "system_sampler_title"; // $NON-NLS-1$
     }
 
     @Override
@@ -87,13 +87,12 @@ public class SystemSamplerGui extends Ab
         setBorder(makeBorder());
 
         add(makeTitlePanel(), BorderLayout.NORTH);
-       
-        JPanel panelb = new VerticalPanel();
-        panelb.add(makeReturnCodePanel());
-        panelb.add(Box.createVerticalStrut(5));
-        panelb.add(makeCommandPanel(), BorderLayout.CENTER);
+        add(makeCommandPanel(), BorderLayout.CENTER);
         
-        add(panelb, BorderLayout.CENTER);
+        JPanel streamsCodePane = new JPanel(new BorderLayout());
+        streamsCodePane.add(makeStreamsPanel(), BorderLayout.NORTH);
+        streamsCodePane.add(makeReturnCodePanel(), BorderLayout.SOUTH);
+        add(streamsCodePane, BorderLayout.SOUTH);
     }
 
     /* Implements JMeterGuiComponent.createTestElement() */
@@ -148,10 +147,12 @@ public class SystemSamplerGui extends Ab
     private JPanel makeReturnCodePanel() {
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
-        panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("return_code_config_box_title")));
-        checkReturnCode = new JCheckBox(JMeterUtils.getResString("check_return_code_title"));
+        panel.setBorder(BorderFactory.createTitledBorder(
+                BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("return_code_config_box_title"))); // $NON-NLS-1$
+        checkReturnCode = new JCheckBox(JMeterUtils.getResString("check_return_code_title"));
// $NON-NLS-1$
         checkReturnCode.addItemListener(this);
-        desiredReturnCode = new JLabeledTextField(JMeterUtils.getResString("expected_return_code_title"));
+        desiredReturnCode = new JLabeledTextField(JMeterUtils.getResString("expected_return_code_title"));
// $NON-NLS-1$
         desiredReturnCode.setSize(desiredReturnCode.getSize().height, 30);
         panel.add(checkReturnCode);
         panel.add(Box.createHorizontalStrut(5));
@@ -166,24 +167,21 @@ public class SystemSamplerGui extends Ab
     private JPanel makeCommandPanel() {       
         JPanel cmdPanel = new JPanel();
         cmdPanel.setLayout(new BoxLayout(cmdPanel, BoxLayout.X_AXIS));
-        
-        directory = new JLabeledTextField(JMeterUtils.getResString("directory_field_title"));
-        cmdPanel.add(directory);
-        cmdPanel.add(Box.createHorizontalStrut(5));
-        command = new JLabeledTextField(JMeterUtils.getResString("command_field_title"));
-        cmdPanel.add(command);
+
+        JPanel cmdWkDirPane = new JPanel(new BorderLayout());
+        command = new JLabeledTextField(JMeterUtils.getResString("command_field_title"));
// $NON-NLS-1$
+        cmdWkDirPane.add(command, BorderLayout.CENTER);
+        directory = new JLabeledTextField(JMeterUtils.getResString("directory_field_title"));
// $NON-NLS-1$
+        cmdWkDirPane.add(directory, BorderLayout.EAST);
+        cmdPanel.add(cmdWkDirPane);
         
         JPanel panel = new VerticalPanel();
-        panel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("command_config_box_title")));
-        panel.add(cmdPanel);
-        panel.add(makeArgumentsPanel());
-        panel.add(makeEnvironmentPanel());
-        panel.add(Box.createVerticalStrut(5));
-        panel.add(stdin);
-        panel.add(Box.createVerticalStrut(5));
-        panel.add(stdout);
-        panel.add(Box.createVerticalStrut(5));
-        panel.add(stderr);
+        panel.setBorder(BorderFactory.createTitledBorder(
+                BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("command_config_box_title"))); // $NON-NLS-1$
+        panel.add(cmdPanel, BorderLayout.NORTH);
+        panel.add(makeArgumentsPanel(), BorderLayout.CENTER);
+        panel.add(makeEnvironmentPanel(), BorderLayout.SOUTH);
         return panel;
     }
     
@@ -191,7 +189,7 @@ public class SystemSamplerGui extends Ab
      * @return JPanel Arguments Panel
      */
     private JPanel makeArgumentsPanel() {
-        argsPanel = new ArgumentsPanel(JMeterUtils.getResString("arguments_panel_title"),
null, true, false , 
+        argsPanel = new ArgumentsPanel(JMeterUtils.getResString("arguments_panel_title"),
null, true, false ,  // $NON-NLS-1$
                 new ObjectTableModel(new String[] { ArgumentsPanel.COLUMN_RESOURCE_NAMES_1
},
                         Argument.class,
                         new Functor[] {
@@ -206,21 +204,35 @@ public class SystemSamplerGui extends Ab
      * @return JPanel Environment Panel
      */
     private JPanel makeEnvironmentPanel() {
-        envPanel = new ArgumentsPanel(JMeterUtils.getResString("environment_panel_title"));
+        envPanel = new ArgumentsPanel(JMeterUtils.getResString("environment_panel_title"));
// $NON-NLS-1$
         return envPanel;
     }
 
     /**
+     * @return JPanel Streams Panel
+     */
+    private JPanel makeStreamsPanel() {
+        JPanel stdPane = new JPanel(new BorderLayout());
+        stdPane.setBorder(BorderFactory.createTitledBorder(
+                BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("command_config_std_streams_title"))); // $NON-NLS-1$
+        stdPane.add(stdin, BorderLayout.NORTH);
+        stdPane.add(stdout, BorderLayout.CENTER);
+        stdPane.add(stderr, BorderLayout.SOUTH);
+        return stdPane;
+    }
+
+    /**
      * @see org.apache.jmeter.gui.AbstractJMeterGuiComponent#clearGui()
      */
     @Override
     public void clearGui() {
         super.clearGui();
-        directory.setText("");
-        command.setText("");
+        directory.setText(""); // $NON-NLS-1$
+        command.setText(""); // $NON-NLS-1$
         argsPanel.clearGui();
         envPanel.clearGui();
-        desiredReturnCode.setText("");
+        desiredReturnCode.setText(""); // $NON-NLS-1$
         checkReturnCode.setSelected(false);
         desiredReturnCode.setEnabled(false);
         stdin.clearGui();

Modified: jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png?rev=1380395&r1=1380394&r2=1380395&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1380395&r1=1380394&r2=1380395&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Sep  3 23:01:02 2012
@@ -1761,7 +1761,7 @@ Note: If the message body is not empty, 
 </properties>
 </component>
 
-<component name="OS Process Sampler"  index="&sect-num;.1.20"  width="615" height="595"
screenshot="os_process_sampler.png">
+<component name="OS Process Sampler"  index="&sect-num;.1.20"  width="783" height="593"
screenshot="os_process_sampler.png">
 <description>
 <p>
 The OS Process Sampler is a sampler that can be used to execute commands on the local machine.<br></br>
@@ -1781,7 +1781,8 @@ This means that the sampler settings wil
 Many OSes have some built-in commands which are not provided as separate executables. 
 For example the Windows DIR command is part of the command interpreter (CMD.EXE).
 These built-ins cannot be run as independent programs, but have to be provided as arguments
to the appropriate command interpreter.
-<br/>
+</p>
+<p>
 For example, the Windows command-line: <b><code>DIR C:\TEMP</code></b>
needs to be specified as follows:
 <pre>
 command:   CMD
@@ -1792,18 +1793,18 @@ Param 3:   C:\TEMP
 </p>
 </description>
 <properties>
-<property name="Check Return Code" required="No">If checked, sampler will compare return
code with Expected Return Code.</property>
-<property name="Expected Return Code" required="No">Expected return code for System
Call, required if "Check Return Code" is checked.</property>
-<property name="Directory" required="No">Directory from which command will be executed,
defaults to folder referenced by "user.dir" System property</property>
-<property name="Command" required="Yes">The System command or shell to execute.</property>
-<property name="OS Process Parameters" required="No">Parameters passed to process.</property>
+<property name="Command" required="Yes">The program name to execute.</property>
+<property name="Working directory" required="No">Directory from which command will
be executed, defaults to folder referenced by "user.dir" System property</property>
+<property name="Command Parameters" required="No">Parameters passed to the program
name.</property>
 <property name="Environment Parameters" required="No">Key/Value pairs added to environment
when running command.</property>
-<property name="File for standard input stream" required="No">Name of file from which
input is to be taken (STDIN).</property>
-<property name="File for standard output stream" required="No">Name of output file
for standard output (STDOUT). 
+<property name="Standard input (stdin)" required="No">Name of file from which input
is to be taken (STDIN).</property>
+<property name="Standard output (stdout" required="No">Name of output file for standard
output (STDOUT). 
 If omitted, output is captured and returned as the response data.</property>
-<property name="File for standard error output stream" required="No">Name of output
file for standard error (STDERR). 
+<property name="Standard error (stderr)" required="No">Name of output file for standard
error (STDERR). 
 If omitted, output is captured and returned as the response data.</property>
 </properties>
+<property name="Check Return Code" required="No">If checked, sampler will compare return
code with Expected Return Code.</property>
+<property name="Expected Return Code" required="No">Expected return code for System
Call, required if "Check Return Code" is checked.</property>
 </component>
 
 <a href="#">^</a>



Mime
View raw message