Summary: | Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea | ||
---|---|---|---|
Product: | JMeter - Now in Github | Reporter: | Marko <vlahovic74> |
Component: | Main | Assignee: | JMeter issues mailing list <issues> |
Status: | RESOLVED FIXED | ||
Severity: | enhancement | CC: | p.mouawad |
Priority: | P2 | ||
Version: | 2.9 | ||
Target Milestone: | --- | ||
Hardware: | All | ||
OS: | All | ||
Attachments: |
Patch for BeanShellAssertionGui
Patch for BeanShellSamplerGui.java Patch for GenericTestBeanCusomizer.java Patch for TextAreaEditor.java Patch for WrapperEditor.java build.properties file that includes rsyntaxtextarea.jar Mapping between ComboBox elements and Syntaxes Patch for ant build file to include rsysntaxtextarea.jar ScreenShot of Syntax Highlight in jmeter RSyntaxTextArea.patch contains the full patch of all java files Adding mapping between languages and available syntaxes |
Description
Marko
2013-07-05 17:54:31 UTC
Created attachment 30541 [details]
Patch for BeanShellSamplerGui.java
Created attachment 30542 [details]
Patch for GenericTestBeanCusomizer.java
Created attachment 30543 [details]
Patch for TextAreaEditor.java
Created attachment 30544 [details]
Patch for WrapperEditor.java
Created attachment 30545 [details]
build.properties file that includes rsyntaxtextarea.jar
Created attachment 30546 [details]
Mapping between ComboBox elements and Syntaxes
Created attachment 30547 [details]
Patch for ant build file to include rsysntaxtextarea.jar
Created attachment 30548 [details]
ScreenShot of Syntax Highlight in jmeter
Created attachment 30549 [details]
RSyntaxTextArea.patch contains the full patch of all java files
Thanks for your contribution, seems to be a very cool improvement. Can you confirm than the file textarea.properties is under Apache License 2 or upload a new version with the AL2 Header, please. @Sebb, the component RSyntaxTextArea is distributed under a "modified BSD license." See: http://fifesoft.com/rsyntaxtextarea/RSyntaxTextArea.License.txt It's seems be compliant with the AL2, I think. The only change (compare to BSD license) is : * Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. For memory, the license compliant with AL2 (BSD is included) http://www.apache.org/legal/resolved.html#category-a == The LICENSE and NOTICE files must modify to include the mention of RSyntaxTextArea's license. (I can do this) (In reply to Milamber from comment #10) > @Sebb, the component RSyntaxTextArea is distributed under a "modified BSD > license." > See: http://fifesoft.com/rsyntaxtextarea/RSyntaxTextArea.License.txt > It's seems be compliant with the AL2, I think. > > The only change (compare to BSD license) is : > * Neither the name of the author nor the names of its contributors may > be used to endorse or promote products derived from this software > without specific prior written permission. > > > For memory, the license compliant with AL2 (BSD is included) > http://www.apache.org/legal/resolved.html#category-a That seems OK, but IANAL. > == > The LICENSE and NOTICE files must modify to include the mention of > RSyntaxTextArea's license. (I can do this) Obviously the new license needs including in LICENSE (or as a separate file linked from it). Are you sure that the NOTICE file needs updating? It's important not to add anything to NOTICE that is not strictly required. This may need asking on the legal-discuss list. I will add the header to the file. No problem. Do you require unit test too? Documentation updates? Created attachment 30550 [details]
Adding mapping between languages and available syntaxes
(In reply to Sebb from comment #11) > (In reply to Milamber from comment #10) > > > == > > The LICENSE and NOTICE files must modify to include the mention of > > RSyntaxTextArea's license. (I can do this) > > Obviously the new license needs including in LICENSE (or as a separate file > linked from it). > > Are you sure that the NOTICE file needs updating? I prefer, because in Mvnrepository site, the indicated license is LGPL, but perhaps it's a doc's bug. In official site, the license is clearly indicated. http://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea/2.0.7 > It's important not to add anything to NOTICE that is not strictly required. > This may need asking on the legal-discuss list. (In reply to Marko from comment #12) > I will add the header to the file. No problem. > Do you require unit test too? Documentation updates? Test unit doesn't seems needed because this is only an visual improvement. In the docs, some screenshots must be update, but I can do this too. Now It's time for me to test your patch :-) (In reply to Milamber from comment #14) > (In reply to Sebb from comment #11) > > (In reply to Milamber from comment #10) > > > > > Are you sure that the NOTICE file needs updating? > > I prefer, because in Mvnrepository site, the indicated license is LGPL, but > perhaps it's a doc's bug. In official site, the license is clearly indicated. That's not sufficient reason to add anything to the NOTICE file. It looks like the code is built using Ant, not Maven, so maybe it was uploaded by a 3rd party who got the pom wrong. But clearly we cannot depend on the jar from Maven Central. > http://mvnrepository.com/artifact/com.fifesoft/rsyntaxtextarea/2.0.7 > > > It's important not to add anything to NOTICE that is not strictly required. > > This may need asking on the legal-discuss list. Thanks. Committed in last trunk. (some changes in your patch: de-tabulation: prefer spaces for indentation, alphabetical order in jars listing, remove unused imports, formatting code) Docs screenshots to do (tomorrow) URL: http://svn.apache.org/r1500124 Log: Bug 55202 - Proposal to add RSyntaxTextArea for BeanShell, BSF, and JSR223 elements Bugzilla Id: 55202 Added: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/textarea.properties (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/WrapperEditor.java jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/r1500390 Log: Get rsyntaxtextarea jar file from official binary zip Bugzilla Id: 55202 Modified: jmeter/trunk/build.properties jmeter/trunk/build.xml URL: http://svn.apache.org/r1500408 Log: Update docs with new screenshots Bugzilla Id: 55202 Added: jmeter/trunk/docs/images/screenshots/beanshell_assertion.png (with props) jmeter/trunk/xdocs/images/screenshots/beanshell_assertion.png (with props) Modified: jmeter/trunk/docs/images/screenshots/beanshell_listener.png jmeter/trunk/docs/images/screenshots/beanshell_postprocessor.png jmeter/trunk/docs/images/screenshots/beanshell_preprocessor.png jmeter/trunk/docs/images/screenshots/beanshellsampler.png jmeter/trunk/docs/images/screenshots/bsf_assertion.png jmeter/trunk/docs/images/screenshots/bsf_listener.png jmeter/trunk/docs/images/screenshots/bsf_postprocessor.png jmeter/trunk/docs/images/screenshots/bsf_preprocessor.png jmeter/trunk/docs/images/screenshots/bsfsampler.png jmeter/trunk/docs/images/screenshots/bsh_assertion.png jmeter/trunk/docs/images/screenshots/jsr223-sampler.png jmeter/trunk/docs/images/screenshots/mongodb-script.png jmeter/trunk/docs/images/screenshots/timers/beanshell_timer.png jmeter/trunk/docs/images/screenshots/timers/bsf_timer.png jmeter/trunk/xdocs/images/screenshots/beanshell_listener.png jmeter/trunk/xdocs/images/screenshots/beanshell_postprocessor.png jmeter/trunk/xdocs/images/screenshots/beanshell_preprocessor.png jmeter/trunk/xdocs/images/screenshots/beanshellsampler.png jmeter/trunk/xdocs/images/screenshots/bsf_assertion.png jmeter/trunk/xdocs/images/screenshots/bsf_listener.png jmeter/trunk/xdocs/images/screenshots/bsf_postprocessor.png jmeter/trunk/xdocs/images/screenshots/bsf_preprocessor.png jmeter/trunk/xdocs/images/screenshots/bsfsampler.png jmeter/trunk/xdocs/images/screenshots/bsh_assertion.png jmeter/trunk/xdocs/images/screenshots/jsr223-sampler.png jmeter/trunk/xdocs/images/screenshots/mongodb-script.png jmeter/trunk/xdocs/images/screenshots/timers/beanshell_timer.png jmeter/trunk/xdocs/images/screenshots/timers/bsf_timer.png jmeter/trunk/xdocs/usermanual/component_reference.xml Seems everything is ok. I close it. Thanks. Great feature. There is still a little one, in JDBC Sampler syntax highlight is done on Java not SQL. URL: http://svn.apache.org/r1501306 Log: Add syntax color for scripts elements (BeanShell, BSF, and JSR223) with RSyntaxTextArea JDBC now uses SQL language format Bugzilla Id: 55202 Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java Date: Thu Sep 26 06:44:29 2013 New Revision: 1526398 URL: http://svn.apache.org/r1526398 Log: Bug 55202 - Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea Add missing configuration properties in jmeter.properties Bugzilla Id: 55202 Modified: jmeter/trunk/bin/jmeter.properties Date: Thu Sep 26 06:46:36 2013 New Revision: 1526400 URL: http://svn.apache.org/r1526400 Log: Bug 55202 - Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea Add a way to disable undo feature in JSyntaxtTextArea, thanks Robert Futrell Bugzilla Id: 55202 Modified: jmeter/trunk/bin/jmeter.properties jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java Date: Thu Sep 26 19:39:31 2013 New Revision: 1526656 URL: http://svn.apache.org/r1526656 Log: Bug 55202 - Add syntax color for scripts elements (BeanShell, BSF, and JSR223) and JDBC elements with RSyntaxTextArea Fixed bad configuration Bugzilla Id: 55202 Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java This issue has been migrated to GitHub: https://github.com/apache/jmeter/issues/3157 |