Merge branch 'release/3.4.2'

naver · Aug 31, 2018 · 91dd80c · 91dd80c
2 parents baf2bd2 + 44227e7
commit 91dd80c
Show file tree

Hide file tree

Showing 82 changed files with 1,066 additions and 889 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,20 @@
+root = true
+
+[*]
+end_of_line = crlf
+insert_final_newline = true
+
+[**.java]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[**.ftl]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
+
+[**.css]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,10 @@
-language: java
-before_install:
-  - ./install_maven_lib.sh
-jdk:
-  - oraclejdk8
-  - oraclejdk7
-script:
-  - mvn test -DskipTests=true
+language: java
+before_install:
+  - ./install-maven-lib.sh
+jdk:
+  - openjdk8
+script:
+  - mvn test
+cache:
+  directories:
+  - $HOME/.m2
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-* nGrinder 3.4 has benn released. See https://github.com/naver/ngrinder/releases
+* nGrinder 3.4 has been released. See https://github.com/naver/ngrinder/releases
 
 nGrinder 
 ========
@@ -9,7 +9,7 @@ nGrinder
 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.
 
 
-Want to to know what's changed from the original grinder platform?
+Want to know what's changed from the original grinder platform?
  * Checkout https://github.com/naver/ngrinder/wiki/Architecture !
 
 To get to know what's different from previous ngrinder 2.0?
@@ -109,5 +109,5 @@ You can join our forum as well
      limitations under the License. 
       
 
-nGrinder includes the following software and libraries as follows. See the LICENCE folder for the license and copyright details for each.
+nGrinder includes the following software and libraries as follows. See the LICENSE folder for the license and copyright details for each.
 * https://github.com/naver/ngrinder/tree/master/license
diff --git a/RELEASE-NOTE.md b/RELEASE-NOTE.md
@@ -1,18 +1,57 @@
+3.4.2 (2018.08.20)
+==================
+
+> This is the last version in 3.4.X. 
+  nGrinder supports only JDK1.7 and JDK1.8.  JDK1.9 or above will be supported from 3.5.
+
+- New feature and changes
+  * Speed up the page navigation when there are many users who have the followers.
+    - Use LAZY patching in JPA
+    - Use Hibernate 2nd Level Cache not to query user
+    - Use id for perftest ordering instead of modified_date to avoid full db search
+  * Add light security mode
+    - Allows multicast / tcp connection to unspecified address compared normal security mode.
+    - Can be configured by adding ```controller.security.level=light``` in system.conf 
+  * Provide the way to turn off security mode in agent config
+    - Allow the some agent to ignore security mode restriction
+    - Can be configured by adding ```agent.enable_security=false``` in agent.conf     
+  * Make agent list shown even for not admin user.
+    - Lists public and own agents in the agent management menu even for non admin users.
+
+- Bug Fix
+  * #274 Use internal in monitor and report plugin
+  * #278 fix bug when har file has no params
+  * #294 Fix bandWidth calculation
+  * #295 Fix csv separator inside SingleConsole
+  * #297 Remove context path from AjaxObj url
+  * #299 Modify NGrinderSecurityManager read access
+  * #303 Fix failed controller test case
+  * #308 Fix test failure
+  * #318 Fix invalid reference bug in login.ftl
+  * #323 Fix invalid rampup section layout
+  * #335 Make GTest only instrument method in ngrinder context
+
+- Improvement
+  * #291 Speed up page navigation
+  * #293 Add setting security level in system configuration
+  * #317 Show agent list to non admin user
+  * #330 Provide the way to turn off security mode in agent config
+
 3.4 (2016.05.24)
 ================
 
 > 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.
-As time goes by, surrounding circumstances(for example Java version or Docker) was been changing.. So we decided to continously enhance nGrinder.
+As time goes by, surrounding circumstances(for example Java version or Docker) was been changing.. So we decided to continuously enhance nGrinder.
 
 
 - New feature and changes
   * Support Java 1.8
     - nGrinder now support Java 1.8. Controller supports java 1.7 or above and Agent supports java 1.6 or above.
   * Provide elaborated script generator
     - Since nGrinder 3.0, we provided the script generation wizard that helps you easily create a default script.
-    -  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.
+    -  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.
     - 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.
-  * Provide brand new nGrinder script recorder
+  * Provide brand-new nGrinder script recorder
     - 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.
     -  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.
     - 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
   * Add intro.js for easy understanding.
     - You can find the very small button "Tip" on every pages. Click it and see what it is.
 
-
-- Bug
+- Bug Fix
   * #136 Support CJK for folder and script name
   * #111 GrinderUtils.getThreadUniqId() is not working in IntelliJ context
   * #103 Fix security issue
@@ -44,7 +82,7 @@ As time goes by, surrounding circumstances(for example Java version or Docker) w
 3.3.1 (2015.06.31/Internal Release)
 ===================================
 
-- Bug
+- Bug Fix
   * #32 Abnormal execution result if the script has a null character(0x0).
   * #33 Too fast timeout when connecting Mbean.
   * #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
   * #38 Need to allow changing a timeout which is related while @BeforeProcess is running.
 
 
-- Trivial fix
+- Trivial Fix
   * Make the target host field 65535 varchar.
   * Modify popover function for showing "Test Log"
   * 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
   * In addition, several UI improvements.
 
 
-- Bug
+- Bug Fix
   * [NGRINDER-679] - Support intellij
   * [NGRINDER-680] - Make test parameter removable
   * [NGRINDER-681] - Fix NullPointerException while getting monitor data
@@ -214,7 +252,7 @@ Special Thanks to Karel Piwko and Egoing.
   * And several UI improvements are included.
 
 
-- Bug
+- Bug Fix
   * [NGRINDER-659] - Fix typo errors
   * [NGRINDER-668] - Fix wrong test schedule calculation when browser timezone and user specified timezone are different
 
@@ -253,7 +291,7 @@ Special Thanks to Karel Piwko and Egoing.
     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.
   * And several UI improvements are included.
 
-- Bug
+- Bug Fix
   * [NGRINDER-633] - Make agent to connect the real ip first if no agent.controller.ip is provided
   * [NGRINDER-634] - Test description including ' breaks the test list layout
   * [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.
   * The available agent memory is calculated more accurately. Instead of using free memory, now it uses actual free memory.
   * Each performance test page retrieval becomes speedy even when there are many files in SVN.
 
-- Bug
+- Bug Fix
   * [NGRINDER-600] - Fix IE10 compatibility issue
   * [NGRINDER-608] - Make the memory setting more concrete for test process
   * [NGRINDER-610] - Fix typo errors
@@ -303,7 +341,7 @@ This made this version more concrete and workable in the large deployment.
   * [NGRINDER-617] - Fix wrong classpath filtering in the process execution
   * [NGRINDER-618] - Dynamic system configuration update is not working after the first update.
   * [NGRINDER-622] - Add host settings for groovy maven project  in quicktest
-  * [NGRINDER-625] - Make groovy tc thread use diffrent test object
+  * [NGRINDER-625] - Make groovy tc thread use different test object
   * [NGRINDER-629] - Clean up the url after upload files
   * [NGRINDER-630] - Use UTF-8 for groovy class loading
 
@@ -349,7 +387,7 @@ We believe nGrinder 3.2 is the most developer friendly performance testing tool
   * And.. several minor UI enhancements.
 
 
-- Bug
+- Bug Fix
   * [NGRINDER-414] - Fix access error to the shared user's repo by SVN
   * [NGRINDER-449] - Fix script display when 2 admin users have a script with same name
   * [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.
   * 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.
 
 
-- Bug
+- Bug Fix
   * [NGRINDER-560] - Make test report visible without login
   * [NGRINDER-564] - Ignore Sigar Exception while collecting network usage.
   * [NGRINDER-569] - Make agent status string longer
@@ -447,7 +485,7 @@ With some bug fix, the following improvements are for the effective operations o
   * Fix the bugs in which the some sampling points are missing in the final result.
 
 
-- Bug
+- Bug Fix
   * [NGRINDER-511] - Make the agent server mode optional
   * [NGRINDER-512] - Provide a user defined statistic chart
   * [NGRINDER-516] - Fix typo errors
@@ -491,8 +529,8 @@ With some bug fix, the following improvements are for the effective operations o
   * Change the default QnA site into nabble not github.
   * 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.
 
-
-- Bug
+ 
+- Bug Fix
   * [NGRINDER-482] - Add grinder.processes and grinder.threads as properties during script validation
   * [NGRINDER-488] - Add a error message when there are no sampling was performed.
   * [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
 > Hot fix for nGrinder 3.0
   Mostly fix the bug which happens if there are more than 1000 tests.
 
-- Bug
+- Bug Fix
 
   * [NGRINDER-367] - Tests over 1000 is not supported
   * [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
 > Hot fix for nGrinder 3.0
   Mostly we made this version work on Ubuntu
 
-- Bug
+- Bug Fix
   * [NGRINDER-332] - User specific agents show max agents value 0
   * [NGRINDER-333] - agent ip is always 127.0.0.1 in Ubuntu
   * [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
 
 > Hot fix for nGrinder 3.0
 
-- Bug
+- Bug Fix
 
   * [NGRINDER-331] - Jar classpath is not passed to the agents
 
@@ -627,7 +665,7 @@ With some bug fix, the following improvements are for the effective operations o
 
 > First Official Version
 
-- Bug
+- Bug Fix
   * [NGRINDER-232] - Running Time is wrong
   * [NGRINDER-238] - If the 1st minute of Test Report and the 1st minutes of Report_in_Detail are much different
   * [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
 
 > Third beta version.
 
-- Bug
+- Bug Fix
   * [NGRINDER-282] - Create a error showing page. For bad request which doesn't exist, redirect to index page.
   * [NGRINDER-283] - Provide DB upgrade feature
   * [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.

diff --git a/deploy_ngrinder_core.sh b/deploy_ngrinder_core.sh
diff --git a/docker/README.md b/docker/README.md
@@ -42,7 +42,7 @@ Port information:
 
 * __80__: Default controller web UI port.
 
-* __9010-9019__: agents connect to the controller cluster thorugh these ports.
+* __9010-9019__: agents connect to the controller cluster through these ports.
 
 * __12000-12029__: controllers allocate stress tests through these ports.
 

diff --git a/install_maven_lib.bat → install-maven-lib.bat b/install_maven_lib.bat → install-maven-lib.bat
diff --git a/install_maven_lib.sh → install-maven-lib.sh b/install_maven_lib.sh → install-maven-lib.sh
diff --git a/ngrinder-controller/pom.xml b/ngrinder-controller/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.ngrinder</groupId>
 		<artifactId>ngrinder</artifactId>
-		<version>3.4-SNAPSHOT</version>
+		<version>3.4.2</version>
 	</parent>
 	<artifactId>ngrinder-controller</artifactId>
 	<name>ngrinder-controller</name>
@@ -278,7 +278,11 @@
 			<artifactId>hibernate-entitymanager</artifactId>
 			<version>4.2.2.Final</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-ehcache</artifactId>
+			<version>4.2.2.Final</version>
+		</dependency>
 
 		<!-- AspectJ dependencies -->
 		<dependency>