Skip to content

Commit 91dd80c

Browse files
committed
Merge branch 'release/3.4.2'
2 parents baf2bd2 + 44227e7 commit 91dd80c

File tree

82 files changed

+1066
-889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1066
-889
lines changed

.editorconfig

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = crlf
5+
insert_final_newline = true
6+
7+
[**.java]
8+
indent_style = tab
9+
indent_size = 4
10+
trim_trailing_whitespace = true
11+
12+
[**.ftl]
13+
indent_style = tab
14+
indent_size = 4
15+
trim_trailing_whitespace = true
16+
17+
[**.css]
18+
indent_style = tab
19+
indent_size = 4
20+
trim_trailing_whitespace = true

.travis.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
language: java
2-
before_install:
3-
- ./install_maven_lib.sh
4-
jdk:
5-
- oraclejdk8
6-
- oraclejdk7
7-
script:
8-
- mvn test -DskipTests=true
1+
language: java
2+
before_install:
3+
- ./install-maven-lib.sh
4+
jdk:
5+
- openjdk8
6+
script:
7+
- mvn test
8+
cache:
9+
directories:
10+
- $HOME/.m2

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* nGrinder 3.4 has benn released. See https://github.com/naver/ngrinder/releases
1+
* nGrinder 3.4 has been released. See https://github.com/naver/ngrinder/releases
22

33
nGrinder
44
========
@@ -9,7 +9,7 @@ nGrinder
99
nGrinder is a platform for stress tests that enables you to execute script creation, test execution, monitoring, and result report generator simultaneously. The open-source nGrinder offers easy ways to conduct stress tests by eliminating inconveniences and providing integrated environments.
1010

1111

12-
Want to to know what's changed from the original grinder platform?
12+
Want to know what's changed from the original grinder platform?
1313
* Checkout https://github.com/naver/ngrinder/wiki/Architecture !
1414

1515
To get to know what's different from previous ngrinder 2.0?
@@ -109,5 +109,5 @@ You can join our forum as well
109109
limitations under the License.
110110
111111

112-
nGrinder includes the following software and libraries as follows. See the LICENCE folder for the license and copyright details for each.
112+
nGrinder includes the following software and libraries as follows. See the LICENSE folder for the license and copyright details for each.
113113
* https://github.com/naver/ngrinder/tree/master/license

RELEASE-NOTE.md

+60-22
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,57 @@
1+
3.4.2 (2018.08.20)
2+
==================
3+
4+
> This is the last version in 3.4.X.
5+
nGrinder supports only JDK1.7 and JDK1.8. JDK1.9 or above will be supported from 3.5.
6+
7+
- New feature and changes
8+
* Speed up the page navigation when there are many users who have the followers.
9+
- Use LAZY patching in JPA
10+
- Use Hibernate 2nd Level Cache not to query user
11+
- Use id for perftest ordering instead of modified_date to avoid full db search
12+
* Add light security mode
13+
- Allows multicast / tcp connection to unspecified address compared normal security mode.
14+
- Can be configured by adding ```controller.security.level=light``` in system.conf
15+
* Provide the way to turn off security mode in agent config
16+
- Allow the some agent to ignore security mode restriction
17+
- Can be configured by adding ```agent.enable_security=false``` in agent.conf
18+
* Make agent list shown even for not admin user.
19+
- Lists public and own agents in the agent management menu even for non admin users.
20+
21+
- Bug Fix
22+
* #274 Use internal in monitor and report plugin
23+
* #278 fix bug when har file has no params
24+
* #294 Fix bandWidth calculation
25+
* #295 Fix csv separator inside SingleConsole
26+
* #297 Remove context path from AjaxObj url
27+
* #299 Modify NGrinderSecurityManager read access
28+
* #303 Fix failed controller test case
29+
* #308 Fix test failure
30+
* #318 Fix invalid reference bug in login.ftl
31+
* #323 Fix invalid rampup section layout
32+
* #335 Make GTest only instrument method in ngrinder context
33+
34+
- Improvement
35+
* #291 Speed up page navigation
36+
* #293 Add setting security level in system configuration
37+
* #317 Show agent list to non admin user
38+
* #330 Provide the way to turn off security mode in agent config
39+
140
3.4 (2016.05.24)
241
================
342

443
> We have not been publically released nGrinder for last 2 years. It's true that we thought previous nGrinder was enough for our internal use.
5-
As time goes by, surrounding circumstances(for example Java version or Docker) was been changing.. So we decided to continously enhance nGrinder.
44+
As time goes by, surrounding circumstances(for example Java version or Docker) was been changing.. So we decided to continuously enhance nGrinder.
645

746

847
- New feature and changes
948
* Support Java 1.8
1049
- nGrinder now support Java 1.8. Controller supports java 1.7 or above and Agent supports java 1.6 or above.
1150
* Provide elaborated script generator
1251
- Since nGrinder 3.0, we provided the script generation wizard that helps you easily create a default script.
13-
- However, it only created simple script for GET method case and pepole frequently asked to us how to use the other methods and how to use cookies and headers in the script.
52+
- However, it only created simple script for GET method case and people frequently asked to us how to use the other methods and how to use cookies and headers in the script.
1453
- In nGrinder 3.4, you can choose one of methods such as GET, POST and set HTTP headers and cookies even form data on the wizard dialog, then it will create useful example codes for you.
15-
* Provide brand new nGrinder script recorder
54+
* Provide brand-new nGrinder script recorder
1655
- A few years ago, we had released a script recorder based on JXBrowser. However it was not easy to run it due to several reasons.
1756
- Now, we have developed brand-new script recorder from the beginning using the Chrome extension technology. If you are using Chrome browser, you have only to install nGrinder Script Recorder package.
1857
- See https://github.com/naver/ngrinder/wiki/nGrinder-Recorder-Guide
@@ -25,8 +64,7 @@ As time goes by, surrounding circumstances(for example Java version or Docker) w
2564
* Add intro.js for easy understanding.
2665
- You can find the very small button "Tip" on every pages. Click it and see what it is.
2766

28-
29-
- Bug
67+
- Bug Fix
3068
* #136 Support CJK for folder and script name
3169
* #111 GrinderUtils.getThreadUniqId() is not working in IntelliJ context
3270
* #103 Fix security issue
@@ -44,7 +82,7 @@ As time goes by, surrounding circumstances(for example Java version or Docker) w
4482
3.3.1 (2015.06.31/Internal Release)
4583
===================================
4684

47-
- Bug
85+
- Bug Fix
4886
* #32 Abnormal execution result if the script has a null character(0x0).
4987
* #33 Too fast timeout when connecting Mbean.
5088
* #40 Cannot switch an user who has 2 characters name on switching other user.
@@ -64,7 +102,7 @@ As time goes by, surrounding circumstances(for example Java version or Docker) w
64102
* #38 Need to allow changing a timeout which is related while @BeforeProcess is running.
65103

66104

67-
- Trivial fix
105+
- Trivial Fix
68106
* Make the target host field 65535 varchar.
69107
* Modify popover function for showing "Test Log"
70108
* Fix a new line issue of install_maven_lib.sh on unix platform.
@@ -138,7 +176,7 @@ You should upgrade both agent and controller to 3.3 version to enjoy the new fea
138176
* In addition, several UI improvements.
139177

140178

141-
- Bug
179+
- Bug Fix
142180
* [NGRINDER-679] - Support intellij
143181
* [NGRINDER-680] - Make test parameter removable
144182
* [NGRINDER-681] - Fix NullPointerException while getting monitor data
@@ -214,7 +252,7 @@ Special Thanks to Karel Piwko and Egoing.
214252
* And several UI improvements are included.
215253

216254

217-
- Bug
255+
- Bug Fix
218256
* [NGRINDER-659] - Fix typo errors
219257
* [NGRINDER-668] - Fix wrong test schedule calculation when browser timezone and user specified timezone are different
220258

@@ -253,7 +291,7 @@ Special Thanks to Karel Piwko and Egoing.
253291
and grinder.jvm.arguments in grinder.properties file at the same folder where the script exists respectively. This is for the extreme use case of ngrinder.
254292
* And several UI improvements are included.
255293

256-
- Bug
294+
- Bug Fix
257295
* [NGRINDER-633] - Make agent to connect the real ip first if no agent.controller.ip is provided
258296
* [NGRINDER-634] - Test description including ' breaks the test list layout
259297
* [NGRINDER-640] - &para turns into different symbol in the code editor
@@ -292,7 +330,7 @@ This made this version more concrete and workable in the large deployment.
292330
* The available agent memory is calculated more accurately. Instead of using free memory, now it uses actual free memory.
293331
* Each performance test page retrieval becomes speedy even when there are many files in SVN.
294332

295-
- Bug
333+
- Bug Fix
296334
* [NGRINDER-600] - Fix IE10 compatibility issue
297335
* [NGRINDER-608] - Make the memory setting more concrete for test process
298336
* [NGRINDER-610] - Fix typo errors
@@ -303,7 +341,7 @@ This made this version more concrete and workable in the large deployment.
303341
* [NGRINDER-617] - Fix wrong classpath filtering in the process execution
304342
* [NGRINDER-618] - Dynamic system configuration update is not working after the first update.
305343
* [NGRINDER-622] - Add host settings for groovy maven project in quicktest
306-
* [NGRINDER-625] - Make groovy tc thread use diffrent test object
344+
* [NGRINDER-625] - Make groovy tc thread use different test object
307345
* [NGRINDER-629] - Clean up the url after upload files
308346
* [NGRINDER-630] - Use UTF-8 for groovy class loading
309347

@@ -349,7 +387,7 @@ We believe nGrinder 3.2 is the most developer friendly performance testing tool
349387
* And.. several minor UI enhancements.
350388

351389

352-
- Bug
390+
- Bug Fix
353391
* [NGRINDER-414] - Fix access error to the shared user's repo by SVN
354392
* [NGRINDER-449] - Fix script display when 2 admin users have a script with same name
355393
* [NGRINDER-580] - Fix the graph fluctuation
@@ -400,7 +438,7 @@ This is the last version 3.1.X series, we'll work on 3.2 as a next release.
400438
* A user can upload dll or so to run test using native libs. SecurityMode should be disabled and JNA should be imported for native lib access.
401439

402440

403-
- Bug
441+
- Bug Fix
404442
* [NGRINDER-560] - Make test report visible without login
405443
* [NGRINDER-564] - Ignore Sigar Exception while collecting network usage.
406444
* [NGRINDER-569] - Make agent status string longer
@@ -447,7 +485,7 @@ With some bug fix, the following improvements are for the effective operations o
447485
* Fix the bugs in which the some sampling points are missing in the final result.
448486

449487

450-
- Bug
488+
- Bug Fix
451489
* [NGRINDER-511] - Make the agent server mode optional
452490
* [NGRINDER-512] - Provide a user defined statistic chart
453491
* [NGRINDER-516] - Fix typo errors
@@ -491,8 +529,8 @@ With some bug fix, the following improvements are for the effective operations o
491529
* Change the default QnA site into nabble not github.
492530
* Change Process and Thread calculation logic more stable to support more than 300 users. Please delete the previous ${NGRINDER_HOME}/process_and_thread_policy.js in advance.
493531

494-
495-
- Bug
532+
533+
- Bug Fix
496534
* [NGRINDER-482] - Add grinder.processes and grinder.threads as properties during script validation
497535
* [NGRINDER-488] - Add a error message when there are no sampling was performed.
498536
* [NGRINDER-496] - Make user not to be able to change the underlying SecurityManager
@@ -569,7 +607,7 @@ With some bug fix, the following improvements are for the effective operations o
569607
> Hot fix for nGrinder 3.0
570608
Mostly fix the bug which happens if there are more than 1000 tests.
571609

572-
- Bug
610+
- Bug Fix
573611

574612
* [NGRINDER-367] - Tests over 1000 is not supported
575613
* [NGRINDER-368] - Agent approval in the agent page 2 is not supported
@@ -587,7 +625,7 @@ With some bug fix, the following improvements are for the effective operations o
587625
> Hot fix for nGrinder 3.0
588626
Mostly we made this version work on Ubuntu
589627

590-
- Bug
628+
- Bug Fix
591629
* [NGRINDER-332] - User specific agents show max agents value 0
592630
* [NGRINDER-333] - agent ip is always 127.0.0.1 in Ubuntu
593631
* [NGRINDER-334] - Error - Abnormally Testing (TOO_LOW_TPS)
@@ -617,7 +655,7 @@ With some bug fix, the following improvements are for the effective operations o
617655

618656
> Hot fix for nGrinder 3.0
619657
620-
- Bug
658+
- Bug Fix
621659

622660
* [NGRINDER-331] - Jar classpath is not passed to the agents
623661

@@ -627,7 +665,7 @@ With some bug fix, the following improvements are for the effective operations o
627665

628666
> First Official Version
629667
630-
- Bug
668+
- Bug Fix
631669
* [NGRINDER-232] - Running Time is wrong
632670
* [NGRINDER-238] - If the 1st minute of Test Report and the 1st minutes of Report_in_Detail are much different
633671
* [NGRINDER-287] - Table titles are overlapped on running page
@@ -650,7 +688,7 @@ With some bug fix, the following improvements are for the effective operations o
650688

651689
> Third beta version.
652690
653-
- Bug
691+
- Bug Fix
654692
* [NGRINDER-282] - Create a error showing page. For bad request which doesn't exist, redirect to index page.
655693
* [NGRINDER-283] - Provide DB upgrade feature
656694
* [NGRINDER-306] - Fixed a but to search with tag. If user selected tag to search items in perftest list page, then he can't search all items.

deploy_ngrinder_core.sh

-3
This file was deleted.

docker/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Port information:
4242

4343
* __80__: Default controller web UI port.
4444

45-
* __9010-9019__: agents connect to the controller cluster thorugh these ports.
45+
* __9010-9019__: agents connect to the controller cluster through these ports.
4646

4747
* __12000-12029__: controllers allocate stress tests through these ports.
4848

File renamed without changes.
File renamed without changes.

ngrinder-controller/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.ngrinder</groupId>
77
<artifactId>ngrinder</artifactId>
8-
<version>3.4-SNAPSHOT</version>
8+
<version>3.4.2</version>
99
</parent>
1010
<artifactId>ngrinder-controller</artifactId>
1111
<name>ngrinder-controller</name>
@@ -278,7 +278,11 @@
278278
<artifactId>hibernate-entitymanager</artifactId>
279279
<version>4.2.2.Final</version>
280280
</dependency>
281-
281+
<dependency>
282+
<groupId>org.hibernate</groupId>
283+
<artifactId>hibernate-ehcache</artifactId>
284+
<version>4.2.2.Final</version>
285+
</dependency>
282286

283287
<!-- AspectJ dependencies -->
284288
<dependency>

0 commit comments

Comments
 (0)