Return-Path: X-Original-To: apmail-jmeter-dev-archive@minotaur.apache.org Delivered-To: apmail-jmeter-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1A5110340 for ; Fri, 5 Jul 2013 21:35:18 +0000 (UTC) Received: (qmail 73489 invoked by uid 500); 5 Jul 2013 21:35:18 -0000 Delivered-To: apmail-jmeter-dev-archive@jmeter.apache.org Received: (qmail 73472 invoked by uid 500); 5 Jul 2013 21:35:18 -0000 Mailing-List: contact dev-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list dev@jmeter.apache.org Received: (qmail 73464 invoked by uid 99); 5 Jul 2013 21:35:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jul 2013 21:35:18 +0000 X-ASF-Spam-Status: No, hits=3.5 required=5.0 tests=FB_GET_MEDS,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of philippe.mouawad@gmail.com designates 209.85.223.175 as permitted sender) Received: from [209.85.223.175] (HELO mail-ie0-f175.google.com) (209.85.223.175) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jul 2013 21:35:14 +0000 Received: by mail-ie0-f175.google.com with SMTP id a13so6208802iee.20 for ; Fri, 05 Jul 2013 14:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=duyIgzRIq4u2e3qHf3JLcY7G+03IP7nOcBm4+dbuCzg=; b=k84fYTFVGH2IJw2tT9qU87/ztYJc8493OX6sxqUdHdGJ8Ftfgr57XdnlKskgw8zvcw pu30Att8hita9RE2OY/C/W32s/AulR2MuWj020ePVA+HLfLDs9gpZyQTOs7Wcz+OaaZb 41VfhgGflfIHdY7AjwF4Jthr7WZdCxlIJbZe3ZBdo/zNVpeSZ4AAv/q8mbuzME1XfGSn ibAEsYJoDd6H4i5oY8PvAeDpyHyESZxG1kPFU6Ucg/S/TRxBS6k3vuEaC9+GZ1Wp41jr +N9V+nnAaAxoIVw657xr++c4KmIlGWfjrWMLLqwBgcEO+3R8iRT5WRMneheF/U5MRnuq 2HCA== MIME-Version: 1.0 X-Received: by 10.43.12.198 with SMTP id pj6mr4407563icb.68.1373060093835; Fri, 05 Jul 2013 14:34:53 -0700 (PDT) Received: by 10.42.88.194 with HTTP; Fri, 5 Jul 2013 14:34:53 -0700 (PDT) In-Reply-To: <51D73914.1020403@apache.org> References: <20130705203955.EE1252388AB8@eris.apache.org> <51D7389A.4080900@apache.org> <51D73914.1020403@apache.org> Date: Fri, 5 Jul 2013 23:34:53 +0200 Message-ID: Subject: Re: svn commit: r1500124 - in /jmeter/trunk: ./ res/maven/ src/components/org/apache/jmeter/assertions/gui/ src/core/org/apache/jmeter/testbeans/gui/ src/protocol/java/org/apache/jmeter/protocol/java/control/gui/ xdocs/ From: Philippe Mouawad To: "dev@jmeter.apache.org" Content-Type: multipart/alternative; boundary=bcaec518701c26049004e0ca773d X-Virus-Checked: Checked by ClamAV on apache.org --bcaec518701c26049004e0ca773d Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable maybe we can open a bug on pom content no ? On Friday, July 5, 2013, Milamber wrote: > > Le 05/07/2013 22:20, Milamber a ecrit : > >> >> Le 05/07/2013 21:55, sebb a ecrit : >> >>> On 5 July 2013 21:39, wrote: >>> >>>> Author: milamber >>>> Date: Fri Jul 5 20:39:54 2013 >>>> New Revision: 1500124 >>>> >>>> URL: http://svn.apache.org/r1500124 >>>> Log: >>>> Bug 55202 - Proposal to add RSyntaxTextArea for BeanShell, BSF, and >>>> JSR223 elements >>>> Bugzilla Id: 55202 >>>> >>> -1 >>> >>> I think the jar needs to be obtained somewhere other than Maven >>> Central, as the pom license there says LGPL. >>> >> > Ah... I just saw the .pom on maven repo... > > > >> The mvnrepository.com website (whish said LGPL) is not official Maven >> repository (and not affiliate with Maven/ASF if you see the whois >> information). >> You cannot trust on informations in this site. >> >> The official website indicate the license (modified BSD), and I have >> added the same version than the binary release (in zip file): >> http://sourceforge.net/**projects/rsyntaxtextarea/** >> files/rsyntaxtextarea-demo/2.**0.7/ >> >> Unfortunately, I don't found a direct link to the jar on official >> website. I think we can keep the download from Maven repo2 (it's not the >> mvvrepository.com site, and don't show any Lgpl license for this jar). >> >> >>> Please remove the download part for now. >>> >>> Added: >>>> jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**textarea.pro= perties >>>> (with props) >>>> Modified: >>>> jmeter/trunk/LICENSE >>>> jmeter/trunk/build.properties >>>> jmeter/trunk/build.xml >>>> jmeter/trunk/eclipse.classpath >>>> jmeter/trunk/res/maven/**ApacheJMeter_parent.pom >>>> jmeter/trunk/src/components/**org/apache/jmeter/assertions/** >>>> gui/BeanShellAssertionGui.java >>>> jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> GenericTestBeanCustomizer.java >>>> jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> TextAreaEditor.java >>>> jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**WrapperEdito= r.java >>>> >>>> jmeter/trunk/src/protocol/**java/org/apache/jmeter/** >>>> protocol/java/control/gui/**BeanShellSamplerGui.java >>>> jmeter/trunk/xdocs/changes.xml >>>> >>>> Modified: jmeter/trunk/LICENSE >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/LICENSE?rev=3D** >>>> 1500124&r1=3D1500123&r2=3D1500124&**view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/LICENSE [utf-8] (original) >>>> +++ jmeter/trunk/LICENSE [utf-8] Fri Jul 5 20:39:54 2013 >>>> @@ -1565,7 +1565,7 @@ The jsoup code-base (include source and >>>> distributed under the open source MIT license as described below. >>>> The MIT License >>>> >>>> -Copyright =EF=BF=BD 2009 - 2012 Jonathan Hedley (jonathan@hedley.net) >>>> +Copyright =EF=BF=BD 2009 - 2012 Jonathan Hedley (jonathan@hedley.net) >>>> >>>> Permission is hereby granted, free of charge, to any person obtainin= g >>>> a >>>> copy of this software and associated documentation files (the >>>> "Software"), >>>> @@ -1926,7 +1926,7 @@ As a special exception, the copyright ho >>>> Open Icon Library from >>>> http://openiconlibrary.**sourceforge.net/ >>>> >>>> -Detailled Licenses information: >>>> +Detailed Licenses information: >>>> http://openiconlibrary.**sourceforge.net/LICENSES.html >>>> >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Packages used by Apache JMeter = =3D=3D=3D=3D=3D=3D=3D=3D=3D >>>> @@ -2029,3 +2029,39 @@ UNLESS OTHERWISE MUTUALLY AGREED TO BY T >>>> >>>> ##############################**##############################** >>>> #################### >>>> >>>> +RSyntaxTextArea License >>>> +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >>>> + >>>> +RSyntaxTextArea from >>>> +http://fifesoft.com/**rsyntaxtextarea/ >>>> + >>>> +Detailed License information: >>>> +http://fifesoft.com/**rsyntaxtextarea/**RSyntaxTextArea.License.txt >>>> + >>>> +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RSyntaxTextArea License = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >>>> +Copyright (c) 2012, Robert Futrell >>>> +All rights reserved. >>>> + >>>> +Redistribution and use in source and binary forms, with or without >>>> +modification, are permitted provided that the following conditions ar= e >>>> met: >>>> + * Redistributions of source code must retain the above copyright >>>> + notice, this list of conditions and the following disclaimer. >>>> + * Redistributions in binary form must reproduce the above copyrig= ht >>>> + notice, this list of conditions and the following disclaimer in >>>> the >>>> + documentation and/or other materials provided with the >>>> distribution. >>>> + * Neither the name of the author nor the names of its contributor= s >>>> may >>>> + be used to endorse or promote products derived from this softwa= re >>>> + without specific prior written permission. >>>> + >>>> +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS >>>> "AS IS" AND >>>> +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >>>> IMPLIED >>>> +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AR= E >>>> +DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY >>>> +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL >>>> DAMAGES >>>> +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR >>>> SERVICES; >>>> +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER >>>> CAUSED AND >>>> +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR >>>> TORT >>>> +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE >>>> OF THIS >>>> +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. >>>> + >>>> +#############################**##############################**######= ############### >>>> >>>> \ No newline at end of file >>>> >>>> Modified: jmeter/trunk/build.properties >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/build.properties?** >>>> rev=3D1500124&r1=3D1500123&r2=3D**1500124&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/build.properties (original) >>>> +++ jmeter/trunk/build.properties Fri Jul 5 20:39:54 2013 >>>> @@ -223,6 +223,11 @@ mongo-java-driver.jar >>>> =3D mongo-java-d >>>> mongo-java-driver.loc =3D >>>> ${maven2.repo}/org/mongodb/**mongo-java-driver/${mongo-** >>>> java-driver.version} >>>> mongo-java-driver.md5 =3D >>>> fed5e6d998256e285396b4e0d81537**bd >>>> >>>> +rsyntaxtextarea.version =3D 2.0.7 >>>> +rsyntaxtextarea.jar =3D rsyntaxtextarea-${** >>>> rsyntaxtextarea.version}.jar >>>> +rsyntaxtextarea.loc =3D ${maven2.repo}/com/fifesoft/** >>>> rsyntaxtextarea/${**rsyntaxtextarea.version} >>>> +rsyntaxtextarea.md5 =3D 00ab3c8ce58bb8bb1dbb3ae506f06d**30 >>>> >>> -1 >>> >>> I don't think we can download from there until the license issue is >>> sorted out. >>> >>> + >>>> slf4j-api.version =3D 1.7.5 >>>> slf4j-api.jar =3D slf4j-api-${slf4j-api.version}**.jar >>>> slf4j-api.loc =3D ${maven2.repo}/org/slf4j/** >>>> slf4j-api/${slf4j-api.version} >>>> >>>> Modified: jmeter/trunk/build.xml >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/build.xml?rev=3D** >>>> 1500124&r1=3D1500123&r2=3D1500124&**view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/build.xml (original) >>>> +++ jmeter/trunk/build.xml Fri Jul 5 20:39:54 2013 >>>> @@ -387,6 +387,7 @@ >>>> >>>> >>>> >>>> + >>>> >>>> >>>> >>>> @@ -454,6 +455,7 @@ >>>> >>>> >>>> >>>> + >>>> >>>> >>>> >>>> @@ -2879,6 +2881,7 @@ run JMeter unless all the JMeter jars ar >>>> >>>> >>>> >>>> + >>>> >>>> >>>> >>>> >>>> Modified: jmeter/trunk/eclipse.classpath >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/eclipse.** >>>> classpath?rev=3D1500124&r1=3D**1500123&r2=3D1500124&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/eclipse.classpath (original) >>>> +++ jmeter/trunk/eclipse.classpath Fri Jul 5 20:39:54 2013 >>>> @@ -76,6 +76,7 @@ >>>> >>>> >>>> >>> 11.2.jar"/> >>>> + >>> 7.jar"/> >>>> >>>> >>>> >>>> >>>> Modified: jmeter/trunk/res/maven/**ApacheJMeter_parent.pom >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/res/maven/** >>>> ApacheJMeter_parent.pom?rev=3D**1500124&r1=3D1500123&r2=3D1500124&**vi= ew=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/res/maven/**ApacheJMeter_parent.pom (original) >>>> +++ jmeter/trunk/res/maven/**ApacheJMeter_parent.pom Fri Jul 5 >>>> 20:39:54 2013 >>>> @@ -84,6 +84,7 @@ under the License. >>>> 4.11 >>>> 2.0 >>>> 2.**11.2 >>>> + 2.0.**7 >>>> 1.7.5 >>>> 2.3.1 >>>> r938 >>>> @@ -357,6 +358,11 @@ under the License. >>>> ${mongo-java-driver.**version} >>>> >>>> >>>> + com.fifesoft >>>> + rsyntaxtextarea >>>> + ${rsyntaxtextarea.**version} >>>> + >>>> + >>>> org.slf4j >>>> slf4j-api >>>> ${slf4j.version} >>>> >>>> Modified: jmeter/trunk/src/components/**org/apache/jmeter/assertions/*= * >>>> gui/BeanShellAssertionGui.java >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/src/components/** >>>> org/apache/jmeter/assertions/**gui/BeanShellAssertionGui.** >>>> java?rev=3D1500124&r1=3D1500123&**r2=3D1500124&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/src/components/**org/apache/jmeter/assertions/**gui/B= eanShellAssertionGui.java >>>> (original) >>>> +++ jmeter/trunk/src/components/**org/apache/jmeter/assertions/**gui/B= eanShellAssertionGui.java >>>> Fri Jul 5 20:39:54 2013 >>>> @@ -24,7 +24,6 @@ import javax.swing.Box; >>>> import javax.swing.JCheckBox; >>>> import javax.swing.JLabel; >>>> import javax.swing.JPanel; >>>> -import javax.swing.JScrollPane; >>>> import javax.swing.JTextArea; >>>> import javax.swing.JTextField; >>>> >>>> @@ -32,6 +31,9 @@ import org.apache.jmeter.assertions.**Bean >>>> import org.apache.jmeter.testelement.**TestElement; >>>> import org.apache.jmeter.testelement.**property.BooleanProperty; >>>> import org.apache.jmeter.util.**JMeterUtils; >>>> +import org.fife.ui.rsyntaxtextarea.**RSyntaxTextArea; >>>> +import org.fife.ui.rsyntaxtextarea.**SyntaxConstants; >>>> +import org.fife.ui.rtextarea.**RTextScrollPane; >>>> >>>> public class BeanShellAssertionGui extends AbstractAssertionGui { >>>> >>>> @@ -43,7 +45,7 @@ public class BeanShellAssertionGui exten >>>> >>>> private JTextField parameters;// parameters to pass to script >>>> file (or script) >>>> >>>> - private JTextArea scriptField;// script area >>>> + private RSyntaxTextArea scriptField; // script area >>>> >>>> public BeanShellAssertionGui() { >>>> init(); >>>> @@ -139,8 +141,10 @@ public class BeanShellAssertionGui exten >>>> } >>>> >>>> private JPanel createScriptPanel() { >>>> - scriptField =3D new JTextArea(); >>>> - scriptField.setRows(4); >>>> + scriptField =3D new RSyntaxTextArea(20,20); >>>> + scriptField.**setSyntaxEditingStyle(**SyntaxConstants.SYNTAX_STYLE_*= * >>>> JAVA); >>>> + scriptField.**setCodeFoldingEnabled(true); >>>> + scriptField.**setAntiAliasingEnabled(true); >>>> scriptField.setLineWrap(true); >>>> scriptField.setWrapStyleWord(**true); >>>> >>>> @@ -149,7 +153,7 @@ public class BeanShellAssertionGui exten >>>> >>>> JPanel panel =3D new JPanel(new BorderLayout()); >>>> panel.add(label, BorderLayout.NORTH); >>>> - panel.add(new JScrollPane(scriptField), BorderLayout.CENTER); >>>> + panel.add(new RTextScrollPane(scriptField), >>>> BorderLayout.CENTER); >>>> >>>> JTextArea explain =3D new JTextArea(JMeterUtils.** >>>> getResString("bsh_assertion_**script_variables")); //$NON-NLS-1$ >>>> explain.setLineWrap(true); >>>> >>>> Modified: jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> GenericTestBeanCustomizer.java >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/src/core/org/** >>>> apache/jmeter/testbeans/gui/**GenericTestBeanCustomizer.** >>>> java?rev=3D1500124&r1=3D1500123&**r2=3D1500124&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**GenericT= estBeanCustomizer.java >>>> (original) >>>> +++ jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**GenericT= estBeanCustomizer.java >>>> Fri Jul 5 20:39:54 2013 >>>> @@ -203,6 +203,8 @@ public class GenericTestBeanCustomizer e >>>> >>>> // Obtain the propertyEditors: >>>> editors =3D new PropertyEditor[descriptors.**length]; >>>> + int scriptLanguageIndex =3D 0; >>>> + int textAreaEditorIndex =3D 0; >>>> for (int i =3D 0; i < descriptors.length; i++) { // Index is >>>> also used for accessing editors array >>>> PropertyDescriptor descriptor =3D descriptors[i]; >>>> String name =3D descriptor.getName(); >>>> @@ -218,7 +220,7 @@ public class GenericTestBeanCustomizer e >>>> PropertyEditor propertyEditor; >>>> Object guiType =3D descriptor.getValue(GUITYPE); >>>> if (guiType instanceof TypeEditor) { >>>> - propertyEditor =3D ((TypeEditor) guiType).getInstance= (** >>>> descriptor); >>>> + propertyEditor =3D ((TypeEditor) guiType).getInstance= (** >>>> descriptor); >>>> } else { >>>> Class editorClass =3D descriptor.** >>>> getPropertyEditorClass(); >>>> if (log.isDebugEnabled()) { >>>> @@ -267,6 +269,10 @@ public class GenericTestBeanCustomizer e >>>> { >>>> ((TestBeanPropertyEditor)**propertyEditor).setDescriptor(**descriptor)= ; >>>> } >>>> + >>>> + if (propertyEditor instanceof TextAreaEditor) { >>>> + textAreaEditorIndex =3D i; >>>> + } >>>> if (propertyEditor.**getCustomEditor() instanceof >>>> JScrollPane) { >>>> scrollerCount++; >>>> } >>>> @@ -276,6 +282,17 @@ public class GenericTestBeanCustomizer e >>>> // Initialize the editor with the provided default value >>>> or null: >>>> setEditorValue(i, descriptor.getValue(DEFAULT)); >>>> >>>> + if (name.equals("scriptLanguage")**) { >>>> + scriptLanguageIndex =3D i; >>>> + } >>>> + >>>> + } >>>> + // In case of BSF and JSR elements i want to add >>>> textAreaEditor as a listener to scriptLanguage ComboBox. >>>> + String beanName =3D this.beanInfo.** >>>> getBeanDescriptor().getName(); >>>> + if (beanName.startsWith("BSF") || >>>> beanName.startsWith("JSR223")) { // $NON-NLS-1$ $NON-NLS-2$ >>>> + WrapperEditor we =3D (WrapperEditor) >>>> editors[scriptLanguageIndex]; >>>> + TextAreaEditor tae =3D (TextAreaEditor) >>>> editors[textAreaEditorIndex]; >>>> + we.addChangeListener(tae); >>>> } >>>> >>>> // Obtain message formats: >>>> >>>> Modified: jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> TextAreaEditor.java >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/src/core/org/** >>>> apache/jmeter/testbeans/gui/**TextAreaEditor.java?rev=3D** >>>> 1500124&r1=3D1500123&r2=3D1500124&**view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**TextArea= Editor.java >>>> (original) >>>> +++ jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**TextArea= Editor.java >>>> Fri Jul 5 20:39:54 2013 >>>> @@ -24,17 +24,23 @@ package org.apache.jmeter.testbeans.**gui; >>>> import java.awt.Component; >>>> import java.awt.event.FocusEvent; >>>> import java.awt.event.FocusListener; >>>> +import java.beans.**PropertyChangeEvent; >>>> +import java.beans.**PropertyChangeListener; >>>> import java.beans.**PropertyEditorSupport; >>>> +import java.util.Properties; >>>> >>>> -import javax.swing.JScrollPane; >>>> -import javax.swing.JTextArea; >>>> -import javax.swing.**ScrollPaneConstants; >>>> +import org.apache.jmeter.util.**JMeterUtils; >>>> +import org.fife.ui.rsyntaxtextarea.**RSyntaxTextArea; >>>> +import org.fife.ui.rsyntaxtextarea.**SyntaxConstants; >>>> +import org.fife.ui.rtextarea.**RTextScrollPane; >>>> >>>> -public class TextAreaEditor extends PropertyEditorSupport implements >>>> FocusListener { >>>> +public class TextAreaEditor extends PropertyEditorSupport implements >>>> FocusListener, PropertyChangeListener { >>>> >>>> - private JTextArea textUI; >>>> + private RSyntaxTextArea textUI; >>>> >>>> - private JScrollPane scroller; >>>> + private RTextScrollPane scroller; >>>> + >>>> + private Properties languageProperties; >>>> >>>> /** {@inheritDoc} */ >>>> @Override >>>> @@ -48,12 +54,17 @@ public class TextAreaEditor extends Prop >>>> } >>>> >>>> private final void init() {// called from ctor, so must not be >>>> overridable >>>> - textUI =3D new JTextArea(); >>>> + textUI =3D new RSyntaxTextArea(20, 20); >>>> + textUI.discardAllEdits(); >>>> + textUI.setSyntaxEditingStyle(**SyntaxConstants.SYNTAX_STYLE_**JAVA); >>>> + textUI.setCodeFoldingEnabled(**true); >>>> + textUI.setAntiAliasingEnabled(**true); >>>> textUI.addFocusListener(this); >>>> textUI.setWrapStyleWord(true); >>>> textUI.setLineWrap(true); >>>> - scroller =3D new JScrollPane(textUI, >>>> ScrollPaneConstants.VERTICAL_**SCROLLBAR_AS_NEEDED, >>>> - ScrollPaneConstants.**HORIZONTAL_SCROLLBAR_NEVER); >>>> + scroller =3D new RTextScrollPane(textUI); >>>> + scroller.**setFoldIndicatorEnabled(true); >>>> + languageProperties =3D JMeterUtils.loadProperties("** >>>> org/apache/jmeter/testbeans/**gui/textarea.properties"); //$NON-NLS-1$ >>>> } >>>> >>>> /** >>>> @@ -112,4 +123,19 @@ public class TextAreaEditor extends Prop >>>> public boolean supportsCustomEditor() { >>>> return true; >>>> } >>>> + >>>> + @Override >>>> + public void propertyChange(**PropertyChangeEvent evt) { >>>> + Object source =3D evt.getSource(); >>>> + if (source instanceof ComboStringEditor && source !=3D null) = { >>>> + ComboStringEditor cse =3D (ComboStringEditor) source; >>>> + String lang =3D cse.getAsText().toLowerCase(); >>>> + if (languageProperties.**containsKey(lang)) { >>>> + textUI.setSyntaxEditingStyle(**languageProperties.** >>>> getProperty(lang)); >>>> + } else { >>>> + textUI.setSyntaxEditingStyle(**SyntaxConstants.SYNTAX_STYLE_**NONE); >>>> + } >>>> + >>>> + } >>>> + } >>>> } >>>> >>>> Modified: jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**Wr= apperEditor.java >>>> >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/src/core/org/** >>>> apache/jmeter/testbeans/gui/**WrapperEditor.java?rev=3D** >>>> 1500124&r1=3D1500123&r2=3D1500124&**view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**WrapperE= ditor.java >>>> (original) >>>> +++ jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**WrapperE= ditor.java >>>> Fri Jul 5 20:39:54 2013 >>>> @@ -445,4 +445,8 @@ class WrapperEditor extends PropertyEdit >>>> guiEditor.setAsText(**lastValidValue); >>>> } >>>> } >>>> + >>>> + public void addChangeListener(**PropertyChangeListener listener) = { >>>> + guiEditor.**addPropertyChangeListener(**listener); >>>> + } >>>> } >>>> \ No newline at end of file >>>> >>>> Added: jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> textarea.properties >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/src/core/org/** >>>> apache/jmeter/testbeans/gui/**textarea.properties?rev=3D** >>>> 1500124&view=3Dauto >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**textarea= .properties >>>> (added) >>>> +++ jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/**textarea= .properties >>>> Fri Jul 5 20:39:54 2013 >>>> @@ -0,0 +1,52 @@ >>>> +# >>>> +# Licensed to the Apache Software Foundation (ASF) under one or more >>>> +# contributor license agreements. See the NOTICE file distributed wi= th >>>> +# this work for additional information regarding copyright ownership. >>>> +# The ASF licenses this file to You under the Apache License, Version >>>> 2.0 >>>> +# (the "License"); you may not use this file except in compliance wit= h >>>> +# the License. You may obtain a copy of the License at >>>> +# >>>> +# http://www.apache.org/**licenses/LICENSE-2.0 >>>> +# >>>> +# Unless required by applicable law or agreed to in writing, software >>>> +# distributed under the License is distributed on an "AS IS" BASIS, >>>> +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or >>>> implied. >>>> +# See the License for the specific language governing permissions and >>>> +# limitations under the License. >>>> +# >>>> + >>>> +javascript =3D text/javascript >>>> +js =3D text/javascript >>>> +jacl =3D text/tcl >>>> +netrexx =3D text/plain >>>> +java =3D text/java >>>> +javaclass =3D text/java >>>> +bml =3D text/xml >>>> +vbscript =3D text/vb >>>> +jscript =3D text/javascript >>>> +perlscript =3D text/perl >>>> +perl =3D text/perl >>>> +jpython =3D text/python >>>> +jython =3D text/python >>>> +lotusscript =3D text/vb >>>> +xslt =3D text/mxml >>>> +pnuts =3D text/java >>>> +beanbasic =3D text/java >>>> +beanshell =3D text/java >>>> +bsh =3D text/unix >>>> +ruby =3D text/ruby >>>> +judoscript =3D text/plain >>>> +groovy =3D text/groovy >>>> +objectscript =3D text/javascript >>>> +prolog =3D text/plain >>>> +rexx =3D text/plain >>>> +applescript =3D text/plain >>>> +ecmascript =3D text/actionscript >>>> +jexl =3D text/java >>>> +jexl2 =3D text/java >>>> +rhino =3D text/javascript >>>> +edit =3D text/unix >>>> +lua =3D text/lua >>>> +php =3D text/php >>>> +lisp =3D text/lisp >>>> +sql =3D text/sql >>>> \ No newline at end of file >>>> >>>> Propchange: jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> textarea.properties >>>> ------------------------------**------------------------------**------= ------------ >>>> >>>> svn:eol-style =3D native >>>> >>>> Propchange: jmeter/trunk/src/core/org/**apache/jmeter/testbeans/gui/** >>>> textarea.properties >>>> ------------------------------**------------------------------**------= ------------ >>>> >>>> svn:mime-type =3D text/plain >>>> >>>> Modified: jmeter/trunk/src/protocol/**java/org/apache/jmeter/** >>>> protocol/java/control/gui/**BeanShellSamplerGui.java >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/src/protocol/** >>>> java/org/apache/jmeter/**protocol/java/control/gui/** >>>> BeanShellSamplerGui.java?rev=3D**1500124&r1=3D1500123&r2=3D1500124&** >>>> view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/src/protocol/**java/org/apache/jmeter/** >>>> protocol/java/control/gui/**BeanShellSamplerGui.java (original) >>>> +++ jmeter/trunk/src/protocol/**java/org/apache/jmeter/** >>>> protocol/java/control/gui/**BeanShellSamplerGui.java Fri Jul 5 >>>> 20:39:54 2013 >>>> @@ -24,7 +24,6 @@ import javax.swing.Box; >>>> import javax.swing.JCheckBox; >>>> import javax.swing.JLabel; >>>> import javax.swing.JPanel; >>>> -import javax.swing.JScrollPane; >>>> import javax.swing.JTextArea; >>>> import javax.swing.JTextField; >>>> >>>> @@ -33,6 +32,9 @@ import org.apache.jmeter.samplers.**gui.Ab >>>> import org.apache.jmeter.testelement.**TestElement; >>>> import org.apache.jmeter.testelement.**property.BooleanProperty; >>>> import org.apache.jmeter.util.**JMeterUtils; >>>> +import org.fife.ui.rsyntaxtextarea.**RSyntaxTextArea; >>>> +import org.fife.ui.rsyntaxtextarea.**SyntaxConstants; >>>> +import org.fife.ui.rtextarea.**RTextScrollPane; >>>> >>>> public class BeanShellSamplerGui extends AbstractSamplerGui { >>>> >>>> @@ -44,7 +46,7 @@ public class BeanShellSamplerGui extends >>>> >>>> private JTextField parameters;// parameters to pass to script >>>> file (or script) >>>> >>>> - private JTextArea scriptField;// script area >>>> + private RSyntaxTextArea scriptField;// script area >>>> >>>> public BeanShellSamplerGui() { >>>> init(); >>>> @@ -153,8 +155,9 @@ public class BeanShellSamplerGui extends >>>> } >>>> >>>> private JPanel createScriptPanel() { >>>> - scriptField =3D new JTextArea(); >>>> - scriptField.setRows(4); >>>> + scriptField =3D new RSyntaxTextArea(20, 20); >>>> + scriptField.**setSyntaxEditingStyle(**SyntaxConstants.SYNTAX_STYLE_*= * >>>> JAVA); >>>> + scriptField.**setCodeFoldingEnabled(true); >>>> scriptField.setLineWrap(true); >>>> scriptField.setWrapStyleWord(**true); >>>> >>>> @@ -163,7 +166,7 @@ public class BeanShellSamplerGui extends >>>> >>>> JPanel panel =3D new JPanel(new BorderLayout()); >>>> panel.add(label, BorderLayout.NORTH); >>>> - panel.add(new JScrollPane(scriptField), BorderLayout.CENTER); >>>> + panel.add(new RTextScrollPane(scriptField), >>>> BorderLayout.CENTER); >>>> >>>> JTextArea explain =3D new JTextArea(JMeterUtils.** >>>> getResString("bsh_script_**variables")); //$NON-NLS-1$ >>>> explain.setLineWrap(true); >>>> >>>> Modified: jmeter/trunk/xdocs/changes.xml >>>> URL: http://svn.apache.org/viewvc/**jmeter/trunk/xdocs/changes.** >>>> xml?rev=3D1500124&r1=3D1500123&r2=3D**1500124&view=3Ddiff >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D**=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>>> >>>> --- jmeter/trunk/xdocs/changes.xml (original) >>>> +++ jmeter/trunk/xdocs/changes.xml Fri Jul 5 20:39:54 2013 >>>> @@ -224,6 +224,7 @@ Transaction Controller now sets Response >>>>
  • 54990 - Download large files avoiding >>>> outOfMemory
    • >>>>
  • 55085 - UX Improvement : Ability to create >>>> New Test Plan from Templates
    • >>>>
  • 55172 - Provide plugins a way to add Top >>>> Menu and menu items
    • >>>> +
  • 55202 - Add syntax color for scripts >>>> elements (BeanShell, BSF, and JSR223) with RSyntaxTextArea
    • >>>> >>>> >>>>

    Non-functional changes

    >>>> >>>> >>>> >> >> > --=20 Cordialement. Philippe Mouawad. --bcaec518701c26049004e0ca773d--