Attachment #19731 for bug #41880

View | Details | Raw Unified | Return to bug 41880
Collapse All | Expand All

Lines 54-59 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (-3 / +96 lines)
54	import org.apache.jmeter.testelement.property.IntegerProperty;	54	import org.apache.jmeter.testelement.property.IntegerProperty;
55	import org.apache.jmeter.testelement.property.JMeterProperty;	55	import org.apache.jmeter.testelement.property.JMeterProperty;
56	import org.apache.jmeter.testelement.property.PropertyIterator;	56	import org.apache.jmeter.testelement.property.PropertyIterator;
		57	import org.apache.jmeter.testelement.property.StringProperty;
57	import org.apache.jmeter.threads.ThreadGroup;	58	import org.apache.jmeter.threads.ThreadGroup;
58	import org.apache.jmeter.timers.Timer;	59	import org.apache.jmeter.timers.Timer;
59	import org.apache.jmeter.util.JMeterUtils;	60	import org.apache.jmeter.util.JMeterUtils;
Lines 112-117 Link Here
112		113
113	public static final String HTTPS_SPOOF = "ProxyControlGui.https_spoof";	114	public static final String HTTPS_SPOOF = "ProxyControlGui.https_spoof";
114		115
		116	public static final String CONTENT_TYPE_EXCLUDE = "ProxyControlGui.content_type_exclude"; // $NON-NLS-1$
		117
		118	public static final String CONTENT_TYPE_INCLUDE = "ProxyControlGui.content_type_include"; // $NON-NLS-1$
		119
115	public static final int GROUPING_NO_GROUPS = 0;	120	public static final int GROUPING_NO_GROUPS = 0;
116		121
117	public static final int GROUPING_ADD_SEPARATORS = 1;	122	public static final int GROUPING_ADD_SEPARATORS = 1;
Lines 144-150 Link Here
144	private boolean samplerDownloadImages;	149	private boolean samplerDownloadImages;
145		150
146	private boolean regexMatch = false;// Should we match using regexes?	151	private boolean regexMatch = false;// Should we match using regexes?
147		152
148	/**	153	/**
149	* Tree node where the samples should be stored.	154	* Tree node where the samples should be stored.
150	* <p>	155	* <p>
Lines 231-236 Link Here
231	setProperty(new BooleanProperty(HTTPS_SPOOF, b));	236	setProperty(new BooleanProperty(HTTPS_SPOOF, b));
232	}	237	}
233		238
		239	public void setContentTypeExclude(String contentTypeExclude) {
		240	setProperty(new StringProperty(CONTENT_TYPE_EXCLUDE, contentTypeExclude));
		241	}
		242
		243	public void setContentTypeInclude(String contentTypeInclude) {
		244	setProperty(new StringProperty(CONTENT_TYPE_INCLUDE, contentTypeInclude));
		245	}
		246
234	public String getClassLabel() {	247	public String getClassLabel() {
235	return JMeterUtils.getResString("proxy_title"); // $NON-NLS-1$	248	return JMeterUtils.getResString("proxy_title"); // $NON-NLS-1$
236	}	249	}
Lines 287-294 Link Here
287	return getPropertyAsBoolean(HTTPS_SPOOF, false);	300	return getPropertyAsBoolean(HTTPS_SPOOF, false);
288	}	301	}
289		302
290		303	public String getContentTypeExclude() {
		304	return getPropertyAsString(CONTENT_TYPE_EXCLUDE);
		305	}
291		306
		307	public String getContentTypeInclude() {
		308	return getPropertyAsString(CONTENT_TYPE_INCLUDE);
		309	}
		310
		311
292	public Class getGuiClass() {	312	public Class getGuiClass() {
293	return org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui.class;	313	return org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui.class;
294	}	314	}
Lines 347-353 Link Here
347	* server's response while recording. A future consideration.	367	* server's response while recording. A future consideration.
348	*/	368	*/
349	public void deliverSampler(HTTPSamplerBase sampler, TestElement[] subConfigs, SampleResult result) {	369	public void deliverSampler(HTTPSamplerBase sampler, TestElement[] subConfigs, SampleResult result) {
350	if (filterUrl(sampler)) {	370	if (filterContentType(result) && filterUrl(sampler)) {
351	JMeterTreeNode myTarget = findTargetControllerNode();	371	JMeterTreeNode myTarget = findTargetControllerNode();
352	Collection defaultConfigurations = findApplicableElements(myTarget, ConfigTestElement.class, false);	372	Collection defaultConfigurations = findApplicableElements(myTarget, ConfigTestElement.class, false);
353	Collection userDefinedVariables = findApplicableElements(myTarget, Arguments.class, true);	373	Collection userDefinedVariables = findApplicableElements(myTarget, Arguments.class, true);
Lines 363-368 Link Here
363		383
364	notifySampleListeners(new SampleEvent(result, sampler.getName()));	384	notifySampleListeners(new SampleEvent(result, sampler.getName()));
365	}	385	}
		386	else {
		387	if(log.isDebugEnabled()) {
		388	log.debug("Sample excluded based on url or content-type: " + result.getUrlAsString() + " - " + result.getContentType());
		389	}
		390	}
366	}	391	}
367		392
368	public void stopProxy() {	393	public void stopProxy() {
Lines 402-407 Link Here
402	return true;	427	return true;
403	}	428	}
404		429
		430	// Package protected to allow test case access
		431	/**
		432	* Filter the response based on the content type.
		433	* If no include nor exclude filter is specified, the result will be included
		434	*
		435	* @param result the sample result to check
		436	*/
		437	boolean filterContentType(SampleResult result) {
		438	String includeExp = getContentTypeInclude();
		439	String excludeExp = getContentTypeExclude();
		440	// If no expressions are specified, we let the sample pass
		441	if((includeExp == null \|\| includeExp.length() == 0) &&
		442	(excludeExp == null \|\| excludeExp.length() == 0)
		443	)
		444	{
		445	return true;
		446	}
		447
		448	// Check that we have a content type
		449	String sampleContentType = result.getContentType();
		450	if(sampleContentType == null \|\| sampleContentType.length() == 0) {
		451	if(log.isDebugEnabled()) {
		452	log.debug("No Content-type found for : " + result.getUrlAsString());
		453	}
		454
		455	return true;
		456	}
		457
		458	if(log.isDebugEnabled()) {
		459	log.debug("Content-type to filter : " + sampleContentType);
		460	}
		461	// Check if the include pattern is mathed
		462	if(includeExp != null && includeExp.length() > 0) {
		463	if(log.isDebugEnabled()) {
		464	log.debug("Include expression : " + includeExp);
		465	}
		466
		467	Pattern pattern = null;
		468	try {
		469	pattern = JMeterUtils.getPatternCache().getPattern(includeExp, Perl5Compiler.READ_ONLY_MASK \| Perl5Compiler.SINGLELINE_MASK);
		470	if(!JMeterUtils.getMatcher().contains(sampleContentType, pattern)) {
		471	return false;
		472	}
		473	} catch (MalformedCachePatternException e) {
		474	log.warn("Skipped invalid content include pattern: " + includeExp, e);
		475	}
		476	}
		477
		478	// Check if the exclude pattern is mathed
		479	if(excludeExp != null && excludeExp.length() > 0) {
		480	if(log.isDebugEnabled()) {
		481	log.debug("Exclude expression : " + excludeExp);
		482	}
		483
		484	Pattern pattern = null;
		485	try {
		486	pattern = JMeterUtils.getPatternCache().getPattern(excludeExp, Perl5Compiler.READ_ONLY_MASK \| Perl5Compiler.SINGLELINE_MASK);
		487	if(JMeterUtils.getMatcher().contains(sampleContentType, pattern)) {
		488	return false;
		489	}
		490	} catch (MalformedCachePatternException e) {
		491	log.warn("Skipped invalid content exclude pattern: " + includeExp, e);
		492	}
		493	}
494
495	return true;
496	}
497
405	/*	498	/*
406	* Helper method to add a Response Assertion	499	* Helper method to add a Response Assertion
407	*/	500	*/




import org.apache.jmeter.gui.util.HorizontalPanel;
import org.apache.jmeter.gui.util.MenuFactory;
import org.apache.jmeter.gui.util.PowerTableModel;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.protocol.http.proxy.ProxyControl;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;

	 * Set/clear the Redirect automatically box on the samplers (default is false)
	 */
	private JCheckBox samplerRedirectAutomatically;

	/**
	 * Set/clear the Follow-redirects box on the samplers (default is true)
	 */
	private JCheckBox samplerFollowRedirects;


	/**
	 * Set/clear the Download images box on the samplers (default is false)
	 */

	 * even if it is really https.
	 */
	private JCheckBox httpsSpoof;

	/**
	 * Regular expression to include results based on content type
	 */
	private JTextField contentTypeInclude;

	/**
	 * Regular expression to exclude results based on content type
	 */
	private JTextField contentTypeExclude;
	
	/**
	 * List of available target controllers

			model.setUseKeepAlive(useKeepAlive.isSelected());
			model.setSamplerDownloadImages(samplerDownloadImages.isSelected());
			model.setRegexMatch(regexMatch.isSelected());
			model.setHttpsSpoof(httpsSpoof.isSelected());
			model.setContentTypeInclude(contentTypeInclude.getText());
			model.setContentTypeExclude(contentTypeExclude.getText());
			TreeNodeWrapper nw = (TreeNodeWrapper) targetNodes.getSelectedItem();
			if (nw == null) {
				model.setTarget(null);

		samplerDownloadImages.setSelected(model.getSamplerDownloadImages());
		regexMatch.setSelected(model.getRegexMatch());
		httpsSpoof.setSelected(model.getHttpsSpoof());
		contentTypeInclude.setText(model.getContentTypeInclude());
		contentTypeExclude.setText(model.getContentTypeExclude());

		reinitializeTargetCombo();// Set up list of potential targets and
									// enable listener

				|| command.equals(ProxyControl.USE_KEEPALIVE)
				|| command.equals(ProxyControl.SAMPLER_DOWNLOAD_IMAGES) 
				|| command.equals(ProxyControl.REGEX_MATCH)
				|| command.equals(ProxyControl.HTTPS_SPOOF)
				|| command.equals(ProxyControl.CONTENT_TYPE_INCLUDE)
				|| command.equals(ProxyControl.CONTENT_TYPE_EXCLUDE)) {
			enableRestart();
		} else if (command.equals(ADD_EXCLUDE)) {
			excludeModel.addNewRow();

		myBox.add(Box.createVerticalStrut(5));
		myBox.add(createHTTPSamplerPanel());
		myBox.add(Box.createVerticalStrut(5));
		myBox.add(createContentTypePanel());
		myBox.add(Box.createVerticalStrut(5));				
		myBox.add(createGroupingPanel());
		myBox.add(Box.createVerticalStrut(5));
		mainPanel.add(myBox, BorderLayout.NORTH);

		Box includeExcludePanel = Box.createVerticalBox();

	}

	private JPanel createTestPlanContentPanel() {
		JLabel label = new JLabel("Test plan content:");

		httpHeaders = new JCheckBox(JMeterUtils.getResString("proxy_headers"));
		httpHeaders.setName(ProxyControl.CAPTURE_HTTP_HEADERS);
		httpHeaders.setSelected(true); // maintain original default

		regexMatch.addActionListener(this);
		regexMatch.setActionCommand(ProxyControl.REGEX_MATCH);

		VerticalPanel mainPanel = new VerticalPanel();
		mainPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
				JMeterUtils.getResString("proxy_test_plan_content")));

		HorizontalPanel nodeCreationPanel = new HorizontalPanel();
		nodeCreationPanel.add(httpHeaders);
		nodeCreationPanel.add(addAssertions);
		nodeCreationPanel.add(regexMatch);
		
		mainPanel.add(createTargetPanel());
		mainPanel.add(createGroupingPanel());
		mainPanel.add(nodeCreationPanel);

		return mainPanel;
	}

	private JPanel createHTTPSamplerPanel() {
		JLabel label = new JLabel("HTTP Sampler settings:");
		
		DefaultComboBoxModel m = new DefaultComboBoxModel();
		// Note: position of these elements in the menu *must* match the
		// corresponding ProxyControl.SAMPLER_TYPE_* values.

		samplerTypeName.setName(ProxyControl.SAMPLER_TYPE_NAME);
		samplerTypeName.setSelectedIndex(0);
		samplerTypeName.addItemListener(this);
		JLabel label2 = new JLabel(JMeterUtils.getResString("proxy_sampler_type"));
		label2.setLabelFor(samplerTypeName);

		samplerRedirectAutomatically = new JCheckBox(JMeterUtils.getResString("follow_redirects_auto"));
		samplerRedirectAutomatically.setName(ProxyControl.SAMPLER_REDIRECT_AUTOMATICALLY);
		samplerRedirectAutomatically.setSelected(false);
		samplerRedirectAutomatically.addActionListener(this);
		samplerRedirectAutomatically.setActionCommand(ProxyControl.SAMPLER_REDIRECT_AUTOMATICALLY);
		
		samplerFollowRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects"));
		samplerFollowRedirects.setName(ProxyControl.SAMPLER_FOLLOW_REDIRECTS);
		samplerFollowRedirects.setSelected(true);
		samplerFollowRedirects.addActionListener(this);
		samplerFollowRedirects.setActionCommand(ProxyControl.SAMPLER_FOLLOW_REDIRECTS);
		
		useKeepAlive = new JCheckBox(JMeterUtils.getResString("use_keepalive"));
		useKeepAlive.setName(ProxyControl.USE_KEEPALIVE);
		useKeepAlive.setSelected(true);
		useKeepAlive.addActionListener(this);
		useKeepAlive.setActionCommand(ProxyControl.USE_KEEPALIVE);

		samplerDownloadImages = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images"));
		samplerDownloadImages.setName(ProxyControl.SAMPLER_DOWNLOAD_IMAGES);
		samplerDownloadImages.setSelected(false);
		samplerDownloadImages.addActionListener(this);
		samplerDownloadImages.setActionCommand(ProxyControl.SAMPLER_DOWNLOAD_IMAGES);
		
		HorizontalPanel panel = new HorizontalPanel();
		panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
				JMeterUtils.getResString("proxy_sampler_settings")));
		panel.add(label2);
		panel.add(samplerTypeName);
		panel.add(samplerRedirectAutomatically);


		return panel;
	}
	
	private JPanel createContentTypePanel() {
		contentTypeInclude = new JTextField(30);
		contentTypeInclude.setName(ProxyControl.CONTENT_TYPE_INCLUDE);
		contentTypeInclude.addActionListener(this);
		contentTypeInclude.setActionCommand(ProxyControl.CONTENT_TYPE_INCLUDE);
		JLabel labelInclude = new JLabel(JMeterUtils.getResString("proxy_content_type_include"));
		labelInclude.setLabelFor(contentTypeInclude);
		// Default value
		contentTypeInclude.setText(JMeterUtils.getProperty("proxy.content_type_include"));

		contentTypeExclude = new JTextField(30);
		contentTypeExclude.setName(ProxyControl.CONTENT_TYPE_EXCLUDE);
		contentTypeExclude.addActionListener(this);
		contentTypeExclude.setActionCommand(ProxyControl.CONTENT_TYPE_EXCLUDE);
		JLabel labelExclude = new JLabel(JMeterUtils.getResString("proxy_content_type_exclude"));
		labelExclude.setLabelFor(contentTypeExclude);
		// Default value
		contentTypeExclude.setText(JMeterUtils.getProperty("proxy.content_type_exclude"));
		
		HorizontalPanel panel = new HorizontalPanel();
		panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
				JMeterUtils.getResString("proxy_content_type_filter")));
		panel.add(labelInclude);
		panel.add(contentTypeInclude);
		panel.add(labelExclude);
		panel.add(contentTypeExclude);
		
		return panel;
	}

	private JPanel createIncludePanel() {
		includeModel = new PowerTableModel(new String[] { INCLUDE_COL }, new Class[] { String.class });
		includeTable = new JTable(includeModel);

Lines 481-488 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages.properties (-3 / +8 lines)
481	path_extension_choice=Path Extension (use ";" as separator)	481	path_extension_choice=Path Extension (use ";" as separator)
482	path_extension_dont_use_equals=Do not use equals in path extension (Intershop Enfinity compatibility)	482	path_extension_dont_use_equals=Do not use equals in path extension (Intershop Enfinity compatibility)
483	path_extension_dont_use_questionmark=Do not use questionmark in path extension (Intershop Enfinity compatibility)	483	path_extension_dont_use_questionmark=Do not use questionmark in path extension (Intershop Enfinity compatibility)
484	patterns_to_exclude=Patterns to Exclude	484	patterns_to_exclude=URL Patterns to Exclude
485	patterns_to_include=Patterns to Include	485	patterns_to_include=URL Patterns to Include
486	pkcs12_desc=PKCS 12 Key (*.p12)	486	pkcs12_desc=PKCS 12 Key (*.p12)
487	port=Port\:	487	port=Port\:
488	property_as_field_label={0}\:	488	property_as_field_label={0}\:
Lines 503-515 Link Here
503	provider_url=Provider URL	503	provider_url=Provider URL
504	proxy_assertions=Add Assertions	504	proxy_assertions=Add Assertions
505	proxy_cl_error=If specifying a proxy server, host and port must be given	505	proxy_cl_error=If specifying a proxy server, host and port must be given
		506	proxy_content_type_exclude=Exclude\:
		507	proxy_content_type_filter=Content-type filter
		508	proxy_content_type_include=Include\:
506	proxy_headers=Capture HTTP Headers	509	proxy_headers=Capture HTTP Headers
507	proxy_httpsspoofing=Attempt https Spoofing	510	proxy_httpsspoofing=Attempt https Spoofing
508	proxy_regex=Regex matching	511	proxy_regex=Regex matching
		512	proxy_sampler_settings=HTTP Sampler settings
		513	proxy_sampler_type=Type\:
509	proxy_separators=Add Separators	514	proxy_separators=Add Separators
510	proxy_target=Target Controller\:	515	proxy_target=Target Controller\:
		516	proxy_test_plan_content=Test plan content
511	proxy_title=HTTP Proxy Server	517	proxy_title=HTTP Proxy Server
512	proxy_usekeepalive=Set Keep-Alive
513	ramp_up=Ramp-Up Period (in seconds)\:	518	ramp_up=Ramp-Up Period (in seconds)\:
514	random_control_title=Random Controller	519	random_control_title=Random Controller
515	random_order_control_title=Random Order Controller	520	random_order_control_title=Random Order Controller

Lines 299-306 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages_fr.properties (-2 / +2 lines)
299	path=Chemin\:	299	path=Chemin\:
300	path_extension_choice=Extension Chamin (utiliser ";" comme separateur)	300	path_extension_choice=Extension Chamin (utiliser ";" comme separateur)
301	path_extension_dont_use_equals=Ne pas utiliser \u00E9gale dans l'extension de chemin (Intershop Enfinity compatibility)	301	path_extension_dont_use_equals=Ne pas utiliser \u00E9gale dans l'extension de chemin (Intershop Enfinity compatibility)
302	patterns_to_exclude=Motifs \u00E0 Exclure	302	patterns_to_exclude=URL Motifs \u00E0 Exclure
303	patterns_to_include=Motifs \u00E0 Inclure	303	patterns_to_include=URL Motifs \u00E0 Inclure
304	property_default_param=Valeur par d\u00E9faut	304	property_default_param=Valeur par d\u00E9faut
305	property_edit=Editer	305	property_edit=Editer
306	property_editor.value_is_invalid_message=Le texte que vous venez d'entrer n'a pas une valeur valide pour cette propri\u00E9t\u00E9.\nLa propri\u00E9t\u00E9 va revenir \u00E0 sa valeur pr\u00E9c\u00E9dente.	306	property_editor.value_is_invalid_message=Le texte que vous venez d'entrer n'a pas une valeur valide pour cette propri\u00E9t\u00E9.\nLa propri\u00E9t\u00E9 va revenir \u00E0 sa valeur pr\u00E9c\u00E9dente.

Lines 115-122 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages_de.properties (-2 / +2 lines)
115	paste=Einf\u00FCgen	115	paste=Einf\u00FCgen
116	paste_insert=Als Eintrag einf\u00FCgen	116	paste_insert=Als Eintrag einf\u00FCgen
117	path_extension_choice=Path Erweiterung (benutze ";" als Trennzeichen)	117	path_extension_choice=Path Erweiterung (benutze ";" als Trennzeichen)
118	patterns_to_exclude=Muster zum ausschliessen	118	patterns_to_exclude=URL Muster zum ausschliessen
119	patterns_to_include=Muster zum einschliessen	119	patterns_to_include=URL Muster zum einschliessen
120	protocol=Protokol\:	120	protocol=Protokol\:
121	proxy_cl_error=Wenn Sie einen Proxy Server spezifizieren, m\u00FCssen Sie den Host und Port angeben	121	proxy_cl_error=Wenn Sie einen Proxy Server spezifizieren, m\u00FCssen Sie den Host und Port angeben
122	random_control_title=Zufalls Kontroller	122	random_control_title=Zufalls Kontroller

Lines 302-308 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages_ja.properties (-1 lines)
302	proxy_separators=\u30BB\u30D1\u30EC\u30FC\u30BF\u306E\u8FFD\u52A0	302	proxy_separators=\u30BB\u30D1\u30EC\u30FC\u30BF\u306E\u8FFD\u52A0
303	proxy_target=\u5BFE\u8C61\u3068\u306A\u308B\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9\:	303	proxy_target=\u5BFE\u8C61\u3068\u306A\u308B\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9\:
304	proxy_title=HTTP \u30D7\u30ED\u30AD\u30B7\u30B5\u30FC\u30D0	304	proxy_title=HTTP \u30D7\u30ED\u30AD\u30B7\u30B5\u30FC\u30D0
305	proxy_usekeepalive=Keep-Alive\u3092\u8A2D\u5B9A
306	ramp_up=Ramp-Up \u671F\u9593 (\u79D2)\:	305	ramp_up=Ramp-Up \u671F\u9593 (\u79D2)\:
307	random_control_title=\u4E71\u6570\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9	306	random_control_title=\u4E71\u6570\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
308	random_order_control_title=\u30E9\u30F3\u30C0\u30E0\u9806\u5E8F\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9	307	random_order_control_title=\u30E9\u30F3\u30C0\u30E0\u9806\u5E8F\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9

Lines 417-423 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages_zh_TW.properties (-1 lines)
417	proxy_separators=\u589E\u52A0\u5206\u9694	417	proxy_separators=\u589E\u52A0\u5206\u9694
418	proxy_target=\u76EE\u6A19\u63A7\u5236\u5668	418	proxy_target=\u76EE\u6A19\u63A7\u5236\u5668
419	proxy_title=HTTP \u4EE3\u7406\u4F3A\u670D\u5668	419	proxy_title=HTTP \u4EE3\u7406\u4F3A\u670D\u5668
420	proxy_usekeepalive=\u4FDD\u6301\u9023\u7DDA
421	ramp_up=\u555F\u52D5\u5EF6\u9072(\u79D2)	420	ramp_up=\u555F\u52D5\u5EF6\u9072(\u79D2)
422	random_control_title=\u96A8\u6A5F\u63A7\u5236\u5668	421	random_control_title=\u96A8\u6A5F\u63A7\u5236\u5668
423	random_order_control_title=\u96A8\u6A5F\u9806\u5E8F\u63A7\u5236\u5668	422	random_order_control_title=\u96A8\u6A5F\u9806\u5E8F\u63A7\u5236\u5668

Lines 87-94 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages_no.properties (-2 / +2 lines)
87	paramtable=Send parametre med foresp\u00F8rselen\:	87	paramtable=Send parametre med foresp\u00F8rselen\:
88	password=Passord	88	password=Passord
89	path=Sti\:	89	path=Sti\:
90	patterns_to_exclude=M\u00F8nster \u00E5 ekskludere	90	patterns_to_exclude=URL M\u00F8nster \u00E5 ekskludere
91	patterns_to_include=M\u00F8nster \u00E5 inkludere	91	patterns_to_include=URL M\u00F8nster \u00E5 inkludere
92	protocol=Protokoll\:	92	protocol=Protokoll\:
93	proxy_title=HTTP proxy server	93	proxy_title=HTTP proxy server
94	ramp_up=Oppstartsperiode (i sekunder)\:	94	ramp_up=Oppstartsperiode (i sekunder)\:

Lines 302-307 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/bin/jmeter.properties (+5 lines)
302	# Apache HTTPClient:	302	# Apache HTTPClient:
303	#jmeter.httpsampler=HTTPSampler2	303	#jmeter.httpsampler=HTTPSampler2
304		304
		305	# Default content-type include filter to use
		306	#proxy.content_type_include=text/html\|text/plain\|text/xml
		307	# Default content-type exclude filter to use
		308	#proxy.content_type_exclude=image/.\|text/css\|application/.
		309
305	#---------------------------------------------------------------------------	310	#---------------------------------------------------------------------------
306	# JMeter Proxy configuration	311	# JMeter Proxy configuration
307	#---------------------------------------------------------------------------	312	#---------------------------------------------------------------------------

Return to bug 41880

Lines 57-62 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (-23 / +71 lines)
57	import org.apache.jmeter.gui.util.HorizontalPanel;	57	import org.apache.jmeter.gui.util.HorizontalPanel;
58	import org.apache.jmeter.gui.util.MenuFactory;	58	import org.apache.jmeter.gui.util.MenuFactory;
59	import org.apache.jmeter.gui.util.PowerTableModel;	59	import org.apache.jmeter.gui.util.PowerTableModel;
		60	import org.apache.jmeter.gui.util.VerticalPanel;
60	import org.apache.jmeter.protocol.http.proxy.ProxyControl;	61	import org.apache.jmeter.protocol.http.proxy.ProxyControl;
61	import org.apache.jmeter.testelement.TestElement;	62	import org.apache.jmeter.testelement.TestElement;
62	import org.apache.jmeter.testelement.TestPlan;	63	import org.apache.jmeter.testelement.TestPlan;
Lines 112-123 Link Here
112	* Set/clear the Redirect automatically box on the samplers (default is false)	113	* Set/clear the Redirect automatically box on the samplers (default is false)
113	*/	114	*/
114	private JCheckBox samplerRedirectAutomatically;	115	private JCheckBox samplerRedirectAutomatically;
		116
115	/**	117	/**
116	* Set/clear the Follow-redirects box on the samplers (default is true)	118	* Set/clear the Follow-redirects box on the samplers (default is true)
117	*/	119	*/
118	private JCheckBox samplerFollowRedirects;	120	private JCheckBox samplerFollowRedirects;
119		121
120
121	/**	122	/**
122	* Set/clear the Download images box on the samplers (default is false)	123	* Set/clear the Download images box on the samplers (default is false)
123	*/	124	*/
Lines 128-133 Link Here
128	* even if it is really https.	129	* even if it is really https.
129	*/	130	*/
130	private JCheckBox httpsSpoof;	131	private JCheckBox httpsSpoof;
		132
		133	/**
		134	* Regular expression to include results based on content type
		135	*/
		136	private JTextField contentTypeInclude;
		137
		138	/**
		139	* Regular expression to exclude results based on content type
		140	*/
		141	private JTextField contentTypeExclude;
131		142
132	/**	143	/**
133	* List of available target controllers	144	* List of available target controllers
Lines 207-213 Link Here
207	model.setUseKeepAlive(useKeepAlive.isSelected());	218	model.setUseKeepAlive(useKeepAlive.isSelected());
208	model.setSamplerDownloadImages(samplerDownloadImages.isSelected());	219	model.setSamplerDownloadImages(samplerDownloadImages.isSelected());
209	model.setRegexMatch(regexMatch.isSelected());	220	model.setRegexMatch(regexMatch.isSelected());
210	model.setHttpsSpoof(httpsSpoof.isSelected());	221	model.setHttpsSpoof(httpsSpoof.isSelected());
		222	model.setContentTypeInclude(contentTypeInclude.getText());
		223	model.setContentTypeExclude(contentTypeExclude.getText());
211	TreeNodeWrapper nw = (TreeNodeWrapper) targetNodes.getSelectedItem();	224	TreeNodeWrapper nw = (TreeNodeWrapper) targetNodes.getSelectedItem();
212	if (nw == null) {	225	if (nw == null) {
213	model.setTarget(null);	226	model.setTarget(null);
Lines 259-264 Link Here
259	samplerDownloadImages.setSelected(model.getSamplerDownloadImages());	272	samplerDownloadImages.setSelected(model.getSamplerDownloadImages());
260	regexMatch.setSelected(model.getRegexMatch());	273	regexMatch.setSelected(model.getRegexMatch());
261	httpsSpoof.setSelected(model.getHttpsSpoof());	274	httpsSpoof.setSelected(model.getHttpsSpoof());
		275	contentTypeInclude.setText(model.getContentTypeInclude());
		276	contentTypeExclude.setText(model.getContentTypeExclude());
262		277
263	reinitializeTargetCombo();// Set up list of potential targets and	278	reinitializeTargetCombo();// Set up list of potential targets and
264	// enable listener	279	// enable listener
Lines 324-330 Link Here
324	\|\| command.equals(ProxyControl.USE_KEEPALIVE)	339	\|\| command.equals(ProxyControl.USE_KEEPALIVE)
325	\|\| command.equals(ProxyControl.SAMPLER_DOWNLOAD_IMAGES)	340	\|\| command.equals(ProxyControl.SAMPLER_DOWNLOAD_IMAGES)
326	\|\| command.equals(ProxyControl.REGEX_MATCH)	341	\|\| command.equals(ProxyControl.REGEX_MATCH)
327	\|\| command.equals(ProxyControl.HTTPS_SPOOF)) {	342	\|\| command.equals(ProxyControl.HTTPS_SPOOF)
		343	\|\| command.equals(ProxyControl.CONTENT_TYPE_INCLUDE)
		344	\|\| command.equals(ProxyControl.CONTENT_TYPE_EXCLUDE)) {
328	enableRestart();	345	enableRestart();
329	} else if (command.equals(ADD_EXCLUDE)) {	346	} else if (command.equals(ADD_EXCLUDE)) {
330	excludeModel.addNewRow();	347	excludeModel.addNewRow();
Lines 437-446 Link Here
437	myBox.add(Box.createVerticalStrut(5));	454	myBox.add(Box.createVerticalStrut(5));
438	myBox.add(createHTTPSamplerPanel());	455	myBox.add(createHTTPSamplerPanel());
439	myBox.add(Box.createVerticalStrut(5));	456	myBox.add(Box.createVerticalStrut(5));
440	myBox.add(createTargetPanel());	457	myBox.add(createContentTypePanel());
441	myBox.add(Box.createVerticalStrut(5));	458	myBox.add(Box.createVerticalStrut(5));
442	myBox.add(createGroupingPanel());
443	myBox.add(Box.createVerticalStrut(5));
444	mainPanel.add(myBox, BorderLayout.NORTH);	459	mainPanel.add(myBox, BorderLayout.NORTH);
445		460
446	Box includeExcludePanel = Box.createVerticalBox();	461	Box includeExcludePanel = Box.createVerticalBox();
Lines 501-508 Link Here
501	}	516	}
502		517
503	private JPanel createTestPlanContentPanel() {	518	private JPanel createTestPlanContentPanel() {
504	JLabel label = new JLabel("Test plan content:");
505
506	httpHeaders = new JCheckBox(JMeterUtils.getResString("proxy_headers"));	519	httpHeaders = new JCheckBox(JMeterUtils.getResString("proxy_headers"));
507	httpHeaders.setName(ProxyControl.CAPTURE_HTTP_HEADERS);	520	httpHeaders.setName(ProxyControl.CAPTURE_HTTP_HEADERS);
508	httpHeaders.setSelected(true); // maintain original default	521	httpHeaders.setSelected(true); // maintain original default
Lines 521-539 Link Here
521	regexMatch.addActionListener(this);	534	regexMatch.addActionListener(this);
522	regexMatch.setActionCommand(ProxyControl.REGEX_MATCH);	535	regexMatch.setActionCommand(ProxyControl.REGEX_MATCH);
523		536
524	HorizontalPanel panel = new HorizontalPanel();	537	VerticalPanel mainPanel = new VerticalPanel();
525	panel.add(label);	538	mainPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
		539	JMeterUtils.getResString("proxy_test_plan_content")));
526		540
527	panel.add(httpHeaders);	541	HorizontalPanel nodeCreationPanel = new HorizontalPanel();
528	panel.add(addAssertions);	542	nodeCreationPanel.add(httpHeaders);
529	panel.add(regexMatch);	543	nodeCreationPanel.add(addAssertions);
		544	nodeCreationPanel.add(regexMatch);
		545
		546	mainPanel.add(createTargetPanel());
		547	mainPanel.add(createGroupingPanel());
		548	mainPanel.add(nodeCreationPanel);
530		549
531	return panel;	550	return mainPanel;
532	}	551	}
533		552
534	private JPanel createHTTPSamplerPanel() {	553	private JPanel createHTTPSamplerPanel() {
535	JLabel label = new JLabel("HTTP Sampler settings:");
536
537	DefaultComboBoxModel m = new DefaultComboBoxModel();	554	DefaultComboBoxModel m = new DefaultComboBoxModel();
538	// Note: position of these elements in the menu must match the	555	// Note: position of these elements in the menu must match the
539	// corresponding ProxyControl.SAMPLER_TYPE_* values.	556	// corresponding ProxyControl.SAMPLER_TYPE_* values.
Lines 543-577 Link Here
543	samplerTypeName.setName(ProxyControl.SAMPLER_TYPE_NAME);	560	samplerTypeName.setName(ProxyControl.SAMPLER_TYPE_NAME);
544	samplerTypeName.setSelectedIndex(0);	561	samplerTypeName.setSelectedIndex(0);
545	samplerTypeName.addItemListener(this);	562	samplerTypeName.addItemListener(this);
546	JLabel label2 = new JLabel("Type:");	563	JLabel label2 = new JLabel(JMeterUtils.getResString("proxy_sampler_type"));
547	label2.setLabelFor(samplerTypeName);	564	label2.setLabelFor(samplerTypeName);
548		565
549	samplerRedirectAutomatically = new JCheckBox("Redirect automatically");	566	samplerRedirectAutomatically = new JCheckBox(JMeterUtils.getResString("follow_redirects_auto"));
550	samplerRedirectAutomatically.setName(ProxyControl.SAMPLER_REDIRECT_AUTOMATICALLY);	567	samplerRedirectAutomatically.setName(ProxyControl.SAMPLER_REDIRECT_AUTOMATICALLY);
551	samplerRedirectAutomatically.setSelected(false);	568	samplerRedirectAutomatically.setSelected(false);
552	samplerRedirectAutomatically.addActionListener(this);	569	samplerRedirectAutomatically.addActionListener(this);
553	samplerRedirectAutomatically.setActionCommand(ProxyControl.SAMPLER_REDIRECT_AUTOMATICALLY);	570	samplerRedirectAutomatically.setActionCommand(ProxyControl.SAMPLER_REDIRECT_AUTOMATICALLY);
554		571
555	samplerFollowRedirects = new JCheckBox("Follow redirects");	572	samplerFollowRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects"));
556	samplerFollowRedirects.setName(ProxyControl.SAMPLER_FOLLOW_REDIRECTS);	573	samplerFollowRedirects.setName(ProxyControl.SAMPLER_FOLLOW_REDIRECTS);
557	samplerFollowRedirects.setSelected(true);	574	samplerFollowRedirects.setSelected(true);
558	samplerFollowRedirects.addActionListener(this);	575	samplerFollowRedirects.addActionListener(this);
559	samplerFollowRedirects.setActionCommand(ProxyControl.SAMPLER_FOLLOW_REDIRECTS);	576	samplerFollowRedirects.setActionCommand(ProxyControl.SAMPLER_FOLLOW_REDIRECTS);
560		577
561	useKeepAlive = new JCheckBox(JMeterUtils.getResString("proxy_usekeepalive"));	578	useKeepAlive = new JCheckBox(JMeterUtils.getResString("use_keepalive"));
562	useKeepAlive.setName(ProxyControl.USE_KEEPALIVE);	579	useKeepAlive.setName(ProxyControl.USE_KEEPALIVE);
563	useKeepAlive.setSelected(true);	580	useKeepAlive.setSelected(true);
564	useKeepAlive.addActionListener(this);	581	useKeepAlive.addActionListener(this);
565	useKeepAlive.setActionCommand(ProxyControl.USE_KEEPALIVE);	582	useKeepAlive.setActionCommand(ProxyControl.USE_KEEPALIVE);
566		583
567	samplerDownloadImages = new JCheckBox("Download images");	584	samplerDownloadImages = new JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images"));
568	samplerDownloadImages.setName(ProxyControl.SAMPLER_DOWNLOAD_IMAGES);	585	samplerDownloadImages.setName(ProxyControl.SAMPLER_DOWNLOAD_IMAGES);
569	samplerDownloadImages.setSelected(false);	586	samplerDownloadImages.setSelected(false);
570	samplerDownloadImages.addActionListener(this);	587	samplerDownloadImages.addActionListener(this);
571	samplerDownloadImages.setActionCommand(ProxyControl.SAMPLER_DOWNLOAD_IMAGES);	588	samplerDownloadImages.setActionCommand(ProxyControl.SAMPLER_DOWNLOAD_IMAGES);
572		589
573	HorizontalPanel panel = new HorizontalPanel();	590	HorizontalPanel panel = new HorizontalPanel();
574	panel.add(label);	591	panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
		592	JMeterUtils.getResString("proxy_sampler_settings")));
575	panel.add(label2);	593	panel.add(label2);
576	panel.add(samplerTypeName);	594	panel.add(samplerTypeName);
577	panel.add(samplerRedirectAutomatically);	595	panel.add(samplerRedirectAutomatically);
Lines 646-652 Link Here
646		664
647	return panel;	665	return panel;
648	}	666	}
		667
		668	private JPanel createContentTypePanel() {
		669	contentTypeInclude = new JTextField(30);
		670	contentTypeInclude.setName(ProxyControl.CONTENT_TYPE_INCLUDE);
		671	contentTypeInclude.addActionListener(this);
		672	contentTypeInclude.setActionCommand(ProxyControl.CONTENT_TYPE_INCLUDE);
		673	JLabel labelInclude = new JLabel(JMeterUtils.getResString("proxy_content_type_include"));
		674	labelInclude.setLabelFor(contentTypeInclude);
		675	// Default value
		676	contentTypeInclude.setText(JMeterUtils.getProperty("proxy.content_type_include"));
649		677
		678	contentTypeExclude = new JTextField(30);
		679	contentTypeExclude.setName(ProxyControl.CONTENT_TYPE_EXCLUDE);
		680	contentTypeExclude.addActionListener(this);
		681	contentTypeExclude.setActionCommand(ProxyControl.CONTENT_TYPE_EXCLUDE);
		682	JLabel labelExclude = new JLabel(JMeterUtils.getResString("proxy_content_type_exclude"));
		683	labelExclude.setLabelFor(contentTypeExclude);
		684	// Default value
		685	contentTypeExclude.setText(JMeterUtils.getProperty("proxy.content_type_exclude"));
		686
		687	HorizontalPanel panel = new HorizontalPanel();
		688	panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
		689	JMeterUtils.getResString("proxy_content_type_filter")));
		690	panel.add(labelInclude);
		691	panel.add(contentTypeInclude);
		692	panel.add(labelExclude);
		693	panel.add(contentTypeExclude);
		694
		695	return panel;
		696	}
		697
650	private JPanel createIncludePanel() {	698	private JPanel createIncludePanel() {
651	includeModel = new PowerTableModel(new String[] { INCLUDE_COL }, new Class[] { String.class });	699	includeModel = new PowerTableModel(new String[] { INCLUDE_COL }, new Class[] { String.class });
652	includeTable = new JTable(includeModel);	700	includeTable = new JTable(includeModel);

Lines 394-401 Link Here

(-)C:/Documents and Settings/alf/workspace/Jmeter/src/core/org/apache/jmeter/resources/messages_es.properties (-3 / +2 lines)
394	path_extension_choice=Extensi\u00F3n de Path (utilice ";" como separador)	394	path_extension_choice=Extensi\u00F3n de Path (utilice ";" como separador)
395	path_extension_dont_use_equals=No utilice el signo igual en la extensi\u00F3n del path (compatibilidad con Intershop Enfinity)	395	path_extension_dont_use_equals=No utilice el signo igual en la extensi\u00F3n del path (compatibilidad con Intershop Enfinity)
396	path_extension_dont_use_questionmark=No utilice el signo interrogaci\u00F3n en la extensi\u00F3n del path (compatibilidad con Intershop Enfinity)	396	path_extension_dont_use_questionmark=No utilice el signo interrogaci\u00F3n en la extensi\u00F3n del path (compatibilidad con Intershop Enfinity)
397	patterns_to_exclude=Patrones a Excluir	397	patterns_to_exclude=URL Patrones a Excluir
398	patterns_to_include=Patrones a Incluir	398	patterns_to_include=URL Patrones a Incluir
399	pkcs12_desc=Clave PKCS (*.p12)	399	pkcs12_desc=Clave PKCS (*.p12)
400	port=Puerto\:	400	port=Puerto\:
401	property_default_param=Valor por defecto	401	property_default_param=Valor por defecto
Lines 417-423 Link Here
417	proxy_separators=A\u00F1adir Separadores	417	proxy_separators=A\u00F1adir Separadores
418	proxy_target=Controlador Objetivo\:	418	proxy_target=Controlador Objetivo\:
419	proxy_title=Servidor Proxy HTTP	419	proxy_title=Servidor Proxy HTTP
420	proxy_usekeepalive=Establecer Keep-Alive
421	ramp_up=Periodo de Subida (en segundos)\:	420	ramp_up=Periodo de Subida (en segundos)\:
422	random_control_title=Controlador Random	421	random_control_title=Controlador Random
423	random_order_control_title=Controlador Random Order	422	random_order_control_title=Controlador Random Order