p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bug in agent

This commit is contained in:
fanfuxiaoran 2014-07-16 16:34:17 +08:00
parent 5c509e320a
commit e8700549c4
20 changed files with 227 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Bench4Q-Web/src/main/java/org/bench4q/web/api/ScriptController.java
View File

@ -37,7 +37,7 @@ public class ScriptController extends BaseController {
public void setScriptMessager(ScriptMessager scriptMessager) {
this.scriptMessager = scriptMessager;
}
@RequestMapping("loadScripts")
@ResponseBody
public Map<String, Object> loadScript(
@ -96,6 +96,34 @@ public class ScriptController extends BaseController {
}
}
@RequestMapping("getScriptXml")
@ResponseBody
public Map<String, Object> loadScriptXml(
@ModelAttribute("accessToken") String accessToken,
@RequestParam String scriptId) {
Map<String, Object> map = new HashMap<String, Object>();
OperateScriptServerResponseModel operateScriptServerResponseModel = this
.getScriptMessager().queryScriptById(accessToken, scriptId);
if (operateScriptServerResponseModel.isSuccess()) {
ScriptModel scriptModel = operateScriptServerResponseModel
.getScriptModels().get(0);
RunScenarioModel runScenarioModel = (RunScenarioModel) MarshalHelper
.tryUnmarshal(RunScenarioModel.class,
scriptModel.getScriptContent());
if (runScenarioModel == null) {
return fail(map, "error script");
}
success(map);
map.put("script", MarshalHelper.tryMarshal(runScenarioModel));
return map;
} else {
map = fail(map,
operateScriptServerResponseModel.getFailCauseString());
return map;
}
}
@RequestMapping("uploadScriptFile")
@ResponseBody
public Map<String, Object> uploadScriptFile(

2
Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/AgentManagerMessager.java
View File

@ -22,11 +22,13 @@ public class AgentManagerMessager extends MasterMessager {
public AgentResponseModel addAgent(String accessToken,
String agentModelContent) {
System.out.println("enter and agent");
String url = this.getBaseUrl() + "/addAgentToPool";
HttpResponse httpResponse = null;
try {
httpResponse = this.getHttpRequester().sendPostXml(url,
agentModelContent, makeAccessTockenMap(accessToken));
System.out.println("agent:"+httpResponse.getContent());
if (!validateHttpResponse(httpResponse)) {
handleInvalidatedResponse(url);
createFaliAgentResponseModel();

2
Bench4Q-Web/src/main/java/org/bench4q/web/security/SessionFilter.java
View File

@ -15,7 +15,7 @@ public class SessionFilter extends OncePerRequestFilter {
HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
String[] notFilter = new String[] { "/index", "/css/", "/script/",
"/i18n/", "/images/", "/publiccontrol/", "/login","/lib/", "/js", "/register" };
"/i18n/", "/images/", "/publiccontrol/", "/login","/lib/", "/js", "/register","/adminLogin"};
// 请求的uri
String uri = request.getRequestURI();

17
Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_en.properties
View File

@ -175,5 +175,20 @@ result-testStatus=Test Status
result-vuser=VUs Active
result-request=Requests
result-loadingInfo=Please wait,loading result data...
result-charts=Charts
testPlan-view=View Result
home-createScript=Create New Script
home-createScript=Create New Script
delete=Delete
result-pages=Pages
result-urls=Urls
result-pages-page=Page
result-pages-script=Script
result-pages-count=Count
result-pages-testMin=Test Min(ms)
result-pages-testMax=Test Max(ms)
result-pages-average=Average(ms)
result-pages-last=Last
result-url-url=URL
result-url-script=Script
result-url-successful=Successful
result-url-total=Total

17
Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_zh.properties
View File

@ -175,7 +175,22 @@ result-deleteGraph=\u5220\u9664\u56FE
result-testStatus=\u6D4B\u8BD5\u72B6\u6001
result-vuser=\u5E76\u53D1\u7528\u6237
result-request=\u53D1\u9001\u8BF7\u6C42
result-charts=\u6D4B\u8BD5\u7ED3\u679C
result-loadingInfo=\u8BF7\u7A0D\u7B49\uFF0C\u6B63\u5728\u52A0\u8F7D\u6570\u636E
testPlan-view=\u67E5\u770B\u7ED3\u679C
scriptmanagerment=\u811A\u672C\u7BA1\u7406
home-createScript=\u65B0\u5EFA\u811A\u672C
home-createScript=\u65B0\u5EFA\u811A\u672C
delete=\u5220\u9664
result-pages=\u9875\u9762
result-urls=\u8BF7\u6C42
result-pages-page=\u9875\u9762
result-pages-script=\u811A\u672C
result-pages-count=\u8BA1\u6570
result-pages-testMin=\u6700\u5C0F\u54CD\u5E94\u65F6\u95F4(ms)
result-pages-testMax=\u6700\u5927\u54CD\u5E94\u65F6\u95F4(ms)
result-pages-average=\u5E73\u5747\u54CD\u5E94\u65F6\u95F4(ms)
result-pages-last=\u6700\u65B0\u54CD\u5E94\u65F6\u95F4(ms)
result-url-url=\u8BF7\u6C42
result-url-script=\u811A\u672C
result-url-successful=\u6210\u529F
result-url-total=\u603B\u5171

247
Bench4Q-Web/src/main/webapp/createScript.jsp
View File

@ -7,8 +7,6 @@
<meta charset="utf-8">
<title>Bench4Q</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description"
content="Bench4Q, a new method for QOS benchmarking.">
<link id="bs-css" href="lib/chrisma/css/bootstrap-cerulean.css"
rel="stylesheet">
<link href="lib/chrisma/css/opa-icons.css" rel="stylesheet">
@ -16,7 +14,6 @@
href="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.2/css/bootstrap-responsive.css"
rel="stylesheet">
<link href="lib/chrisma/css/charisma-app.css" rel="stylesheet">
<style type="text/css">
body {
padding-bottom: 40px;
@ -30,40 +27,15 @@ body {
<link href="css/bench4q.css" rel="stylesheet">
<link href='css/plugin.css' rel='stylesheet'>
<link rel="shortcut icon" href="images/bench4q.png">
<!-- The HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- The fav icon -->
<link rel="shortcut icon" href="img/favicon.ico">
</head>
<body>
<fmt:bundle basename="i18n">
<!-- topbar starts -->
<jsp:include page="publiccontrol/navigatebar.jsp"></jsp:include>
<!-- topbar ends -->
<div class="container-fluid">
<div class="row-fluid">
<jsp:include page="publiccontrol/leftmenubar.jsp"></jsp:include>
<noscript>
<div class="alert alert-block span10">
<h4 class="alert-heading">
<fmt:message key="warning" />
!
</h4>
<p>
<fmt:message key="warningcontent1" />
<a href="http://en.wikipedia.org/wiki/JavaScript" target="_blank">JavaScript</a>
<fmt:message key="warningcontent2" />
.
</p>
</div>
</noscript>
<div id="content" class="span10">
<!-- content starts -->
<ul class="breadcrumb">
<li><a href="homepage.jsp"><fmt:message key="home" /></a> <span
class="divider">/</span></li>
@ -72,126 +44,118 @@ body {
<li><a href="createScript.jsp"><fmt:message
key="home-createScript" /></a></li>
</ul>
<div class="tab">
<div class="span12" id="tabs">
<ul style="cursor: pointer" class="nav nav-tabs">
<li id="tow1" onclick='setTab("tow",1,2);' class="on"><a
href="#"><fmt:message key="plugin_jsp_plugins" />(usePlugins)</a></li>
<li id="tow2" onclick='setTab("tow",2,2);'><a href="#"><fmt:message
key="plugin_jsp_behavior" /> (behaviors)</a></li>
<li><a href="#usePlugin"><fmt:message
key="plugin_jsp_plugins" />(usePlugins)</a></li>
<li><a href="#behavior"><fmt:message
key="plugin_jsp_behavior" />(behaviors)</a></li>
</ul>
</div>
<div class="tabContent">
<div class="span12">
<div id="cont_tow_1" class="one block">
<div class="box span6">
<div class="box-header well" data-original-title>
<i class="icon-pencil left"></i>
<h2>
<span><fmt:message key="plugin_jsp_plugins" />(usePlugins)</span>
</h2>
<div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i
class="icon-chevron-up"></i></a>
</div>
</div>
<div class="box-content row-fluid">
<div id="usePlugin" class="listArea span8"></div>
<div class=" span4 button-div">
<div>
<button type="submit" class="btn btn-primary btn-width"
id="addPlugin">
<fmt:message key="plugin_jsp_add" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="removePlugin">
<fmt:message key="plugin_jsp_remove" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="removeAllPlugin">
<fmt:message key="plugin_jsp_clear" />
</button>
</div>
</div>
</div>
<div id="usePlugin" class="one block box span6">
<div class="box-header well" data-original-title>
<i class="icon-pencil left"></i>
<h2>
<span><fmt:message key="plugin_jsp_plugins" />(usePlugins)</span>
</h2>
<div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i
class="icon-chevron-up"></i></a>
</div>
<div class="span6" id="pluginParams"></div>
</div>
<!-- <div id="cont_tow_2" class="one " style="display: none"></div> -->
<div id="cont_tow_2" class="one " style="display: none">
<div class="box span6">
<div class="box-header well" data-original-title>
<i class="icon-pencil left"></i>
<h2>
<i></i>
<fmt:message key="plugin_jsp_behavior" />
(behaviors)
</h2>
<div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i
class="icon-chevron-up"></i></a>
</div>
<div class="box-content row-fluid">
<div id="usePlugin" class="listArea span8"></div>
<div class=" span4 button-div">
<div>
<button type="submit" class="btn btn-primary btn-width"
id="addPlugin">
<fmt:message key="plugin_jsp_add" />
</button>
</div>
<div class="box-content row-fluid">
<div id="behaviorArea" class="listArea span8"></div>
<div class="span4 button-div">
<div class="hide" id="insertBeforeButton">
<button type="submit" class="btn btn-primary btn-width"
id="insertBefore">
<fmt:message key="plugin_jsp_insertBefore" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="insertAfter">
<fmt:message key="plugin_jsp_insertAfter" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="removeBehaviorWithPlugin">
<fmt:message key="plugin_jsp_remove" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="clearBehaviorWithPluginList">
<fmt:message key="plugin_jsp_clear" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="removePlugin">
<fmt:message key="plugin_jsp_remove" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="removeAllPlugin">
<fmt:message key="plugin_jsp_clear" />
</button>
</div>
</div>
</div>
<div class="span6" id="pluginParams"></div>
</div>
<div id="behavior" class="one ">
<div class="box span6">
<div class="box-header well" data-original-title>
<i class="icon-pencil left"></i>
<h2>
<i></i>
<fmt:message key="plugin_jsp_behavior" />
(behaviors)
</h2>
<div class="box-icon">
<a href="#" class="btn btn-minimize btn-round"><i
class="icon-chevron-up"></i></a>
</div>
</div>
<div class="box-content row-fluid">
<div id="behaviorArea" class="listArea span8"></div>
<div class="span4 button-div">
<div class="hide" id="insertBeforeButton">
<button type="submit" class="btn btn-primary btn-width"
id="insertBefore">
<fmt:message key="plugin_jsp_insertBefore" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="insertAfter">
<fmt:message key="plugin_jsp_insertAfter" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="removeBehaviorWithPlugin">
<fmt:message key="plugin_jsp_remove" />
</button>
</div>
<div>
<button type="submit" class="btn btn-primary btn-width"
id="clearBehaviorWithPluginList">
<fmt:message key="plugin_jsp_clear" />
</button>
</div>
</div>
</div>
<div class="span6">
<div id="showPluginMethod" class="showPluginMethod"></div>
<div class="hide" id="submitBehaviors">
<p>
<fmt:message key="plugin_jsp_scriptName"></fmt:message>
<input id="writeAScriptName" type="text" name="scriptName"
size=20></input>
</p>
<p>
<button class='btn-large' onClick="submit(this);">
<fmt:message key="plugin_jsp_submit" />
</button>
</p>
</div>
</div>
<div class="span6">
<div id="showPluginMethod" class="showPluginMethod"></div>
<div class="hide" id="submitBehaviors">
<p>
<fmt:message key="plugin_jsp_scriptName"></fmt:message>
<input id="writeAScriptName" type="text" name="scriptName"
size=20></input>
</p>
<p>
<button class='btn-large' onClick="submit(this);">
<fmt:message key="plugin_jsp_submit" />
</button>
</p>
</div>
</div>
</div>
</div>
</div>
<!--/#content.span10-->
</div>
<hr>
<div class="modal hide fade " id="myModal_Plugin">
<div class="modal hide fade " id="selectUsePlugin">
<div class="modal-header">
<button type="button" id="myModal-close" class="close"
data-dismiss="modal">×</button>
@ -215,7 +179,7 @@ body {
</div>
</div>
<div class="modal hide fade " id="myModal_Behavior">
<div class="modal hide fade " id="selectBehavior">
<div class="modal-header">
<button type="button" id="myModal-close" class="close"
data-dismiss="modal">×</button>
@ -249,35 +213,18 @@ body {
</div>
<jsp:include page="publiccontrol/footer.jsp"></jsp:include>
</div>
<!--/.fluid-container-->
<!-- external javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<!-- jQuery -->
<script
src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-2.1.0.min.js"></script>
<script
src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.10.4/jquery-ui.min.js"></script>
<script src="lib/jqueryi18n/jquery.i18n.properties-1.0.9.js"></script>
<script src="lib/bootstrap/js/bootstrap-modal.js"></script>
<script
src='http://ajax.aspnetcdn.com/ajax/jquery.dataTables/1.9.4/jquery.dataTables.js'></script>
<script src="lib/chrisma/js/jquery.cookie.js"></script>
<script src="lib/chrisma/js/theme.js"></script>
<script src="script/base.js"></script>
<script src="lib/HashMap/HashMap.js"></script>
<script src="script/ScriptEditor/uiCommon.js"></script>
<script src="script/ScriptEditor/plugin.js"></script>
<script src="script/ScriptEditor/paramInfosForm.js"></script>
<script src="script/ScriptEditor/pluginModel.js"></script>
<script src="script/ScriptEditor/ContainerManager.js"></script>
<script src="script/ScriptEditor/usePluginEditor.js"></script>
<script src="script/ScriptEditor/useBehaviorEditor.js"></script>
<script src="script/ScriptEditor/scriptEditor.js"></script>
<script src="script/ScriptEditor/submitPluginMessage.js"></script>
<script src="script/editor/usePlugin.js"></script>
<script src="script/editor/createScript.js"></script>
</fmt:bundle>
</body>
</html>

9
Bench4Q-Web/src/main/webapp/i18n/i18n.properties
View File

@ -28,4 +28,11 @@ test-ErrorInDistributeLoadForScript=ErrorInDistributeLoadForScript
test-Complete=Complete
view=View
script-edit=Edit
script-deleteSuc=Delete Script Success
script-deleteSuc=Delete Script Success
result-url=url
result-url-statusCode=StatusCode
result-url-count=Count
result-url-contentLength=Content Length
result-url-minRes=Min Response Time(ms)
result-url-maxRes=Max Response Time(ms)
result-url-totalRes=Total Response Time(ms)

9
Bench4Q-Web/src/main/webapp/i18n/i18n_zh-CN.properties
View File

@ -23,4 +23,11 @@ test-ErrorInDistributeLoadForScript=\u5206\u53D1\u4EE3\u7406\u9519\u8BEF
test-Complete=\u5B8C\u6210
view=\u67E5\u770B
script-edit=\u7F16\u8F91
script-deleteSuc=\u5220\u9664\u811A\u672C\u6210\u529F
script-deleteSuc=\u5220\u9664\u811A\u672C\u6210\u529F
result-url=\u8BF7\u6C42
result-url-statusCode=\u72B6\u6001\u7801
result-url-count=\u8BA1\u6570
result-url-contentLength=\u5185\u5BB9\u957F\u5EA6
result-url-minRes=\u6700\u5C0F\u76F8\u5E94\u65F6\u95F4(ms)
result-url-maxRes=\u6700\u5927\u54CD\u5E94\u65F6\u95F4(ms)
result-url-totalRes=\u603B\u5171\u54CD\u5E94\u65F6\u95F4(ms)

66
Bench4Q-Web/src/main/webapp/result.jsp
View File

@ -63,35 +63,37 @@ body {
</div>
</div>
<div class="row-fluid">
<h4 class="pull-left">Charts</h4>
<h4 class="pull-left"><fmt:message key="result-charts" /></h4>
<div class="field-inline">
<button type="button" class="btn btn-primary " id="del-graph">Delete
Graph</button>
<button type="button" class="btn btn-primary " id="del-graph">
<fmt:message key="result-deleteGraph" />
</button>
</div>
<div class="field-inline">
<button type="button" class="btn btn-primary " id="add-graph">Add
Graph</button>
<button type="button" class="btn btn-primary " id="add-graph">
<fmt:message key="result-addGraph" />
</button>
</div>
</div>
<div class="app-container " id="chart"></div>
<div class="row-fluid">
<h4 class="pull-left">Pages</h4>
<h4 class="pull-left"><fmt:message key="result-pages" /></h4>
</div>
<div class="app-container">
<table id="page"
class="table table-striped table-bordered bootstrap-datatable datatable">
<thead>
<tr>
<th>Page</th>
<th>Script</th>
<th>Count</th>
<th>Test Min</th>
<th>Test Max</th>
<th>Average</th>
<th>Last</th>
<th><fmt:message key="result-pages-page" /></th>
<th><fmt:message key="result-pages-script" /></th>
<th><fmt:message key="result-pages-count" /></th>
<th><fmt:message key="result-pages-testMin" /> </th>
<th><fmt:message key="result-pages-testMax" /></th>
<th><fmt:message key="result-pages-average" /></th>
<th><fmt:message key="result-pages-last" /></th>
</tr>
</thead>
<tbody>
@ -99,7 +101,7 @@ body {
</table>
</div>
<div class="row-fluid">
<h4 class="pull-left">Urls</h4>
<h4 class="pull-left"><fmt:message key="result-urls" /></h4>
</div>
<div class="app-container dataTables_wrapper">
<table id="url"
@ -107,11 +109,11 @@ body {
<thead>
<tr>
<th></th>
<th>URL</th>
<th>Script</th>
<th>Successful</th>
<th>Total</th>
<th>detail</th>
<th><fmt:message key="result-url-url" /></th>
<th><fmt:message key="result-url-script" /></th>
<th><fmt:message key="result-url-successful" /></th>
<th><fmt:message key="result-url-total" /></th>
<th>details</th>
</tr>
</thead>
<tbody>
@ -119,7 +121,7 @@ body {
</table>
</div>
<div class="app-container" id="url-distribution"></div>
<!-- <div class="app-container" id="url-distribution"></div> -->
</div>
</div>
@ -128,25 +130,37 @@ body {
<div class="modal-header">
<button type="button" id="myModal-close" class="close"
data-dismiss="modal">x</button>
<h3>Add Graph</h3>
<h3>
<fmt:message key="result-addGraph" />
</h3>
</div>
<div class="modal-body" id="add-graph-list"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" id="add-graph-add"
data-dismiss="modal">add</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">cancel</button>
data-dismiss="modal">
<fmt:message key="add" />
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">
<fmt:message key="cancel" />
</button>
</div>
</div>
<div class="modal hide fade" id="del-graph-modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">x</button>
<h3>Delete Graph</h3>
<h3>
<fmt:message key="result-deleteGraph" />
</h3>
</div>
<div class="modal-body" id="del-graph-list"></div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" id="del-graph-del"
data-dismiss="modal">delete</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">cancel</button>
data-dismiss="modal">
<fmt:message key="delete" />
</button>
<button type="button" class="btn btn-primary" data-dismiss="modal">
<fmt:message key="cancel" />
</button>
</div>
</div>
<div class="modal hide fade" id="load">

8
Bench4Q-Web/src/main/webapp/script-edit.jsp
View File

@ -11,15 +11,10 @@
content="Bench4Q, a new method for QOS benchmarking.">
<link id="bs-css" href="lib/chrisma/css/bootstrap-cerulean.css"
rel="stylesheet">
<link href="lib/chrisma/css/opa-icons.css" rel="stylesheet">
<link
href="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.2/css/bootstrap-responsive.css"
rel="stylesheet">
<link href="lib/chrisma/css/charisma-app.css" rel="stylesheet">
<link rel="shortcut icon" href="image/bench4q.png">
<link
href="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.2/css/bootstrap-responsive.css"
rel="stylesheet">
<link href="lib/chrisma/css/charisma-app.css" rel="stylesheet">
<link href='lib/chrisma/css/opa-icons.css' rel='stylesheet'>
<link href='lib/jsoneditor/css/jsoneditor.css' rel='stylesheet'>
@ -143,6 +138,7 @@
<script
src="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.1/bootstrap.min.js"></script>
<script src="lib/jqueryi18n/jquery.i18n.properties-1.0.9.js"></script>
<script src="script/base.js"></script>
<script src="lib/chrisma/js/jquery.cookie.js"></script>
<script src="lib/chrisma/js/theme.js"></script>
<script src="lib/jsonvalidate/script-edit-uri.js"></script>
@ -153,8 +149,8 @@
<script src="lib/ace/js/mode-json.js"></script>
<script src="lib/ace/js/theme-textmate.js"></script>
<script src="lib/ace/js/theme-jsoneditor.js"></script>
<script src="lib/ace/js/ext-searchbox.js"></script>
<script src="lib/bootstrap/js/bootstrap-collapse.js"></script>
<script src="script/base.js"></script>
<script src="script/ScriptEditor/pluginCommon.js"></script>
<script src="script/ScriptEditor/jsonEditorApp.js"></script>
<script src="script/ScriptEditor/paramInfosForm.js"></script>

1
Bench4Q-Web/src/main/webapp/script.jsp
View File

@ -182,6 +182,7 @@ body {
<script
src="http://ajax.aspnetcdn.com/ajax/bootstrap/2.3.1/bootstrap.min.js"></script>
<script src="lib/chrisma/js/jquery.cookie.js"></script>
<script src="http://malsup.github.com/jquery.form.js"></script>
<script src="lib/dataTable/js/jquery.dataTables.js"></script>
<script src="lib/chrisma/js/theme.js"></script>

124
Bench4Q-Web/src/main/webapp/script/ScriptEditor/jsonEditorApp.js
View File

@ -1,124 +0,0 @@
$(function() {
var scriptId = getvars()['scriptId'];
editor.load(scriptId);
});
var modelData;
function getvars() {
var vars = [], hash;
var hashes = window.location.href.slice(
window.location.href.indexOf('?') + 1).split('&');
for (var i = 0; i < hashes.length; i++)
{
hash = hashes[i].split('=');
vars.push(hash[0]);
vars[hash[0]] = hash[1];
}
return vars;
}
var codeEditor = null, editor = {};
editor.load = function(scriptId) {
try {
editor.scriptId = scriptId;
$.post("getScript", {
scriptId : scriptId
}, function(data) {
if (!data.success) {
alert("failed to get script:" + data.failedMessage);
editor.originalData = "";
return;
} else {
data = eval("("+data.script+")");
}
modelData=data;
editor.originalData = data;
var codeContainer = document.getElementById("codeEditor");
var options = {
mode : 'tree',
modes : [ 'code', 'tree' ], // allowed modes
error : function(err) {
alert(err.toString());
}
};
codeEditor = new jsoneditor.JSONEditor(codeContainer, options);
codeEditor.set(data);
loadUsePluigns(data);
}, "json");
var $submit = $("#submit");
$submit.click(function() {
editor.save();
});
var $cancel = $("#cancel");
$cancel.click(function() {
editor.cancel();
});
var $validate = $('#validate');
$validate.click(function() {
jsonValidate(codeEditor.get());
});
} catch (p) {
alert(p);
}
}, editor.save = function() {
var div = document.getElementById("showPluginMethodForm").firstChild;
saveFormModification(div,"behavior");
codeEditor.set(modelData);
if (codeEditor != null) {
var script = codeEditor.get();
$.ajax({
url : "updateScript",
data : {
scriptId : editor.scriptId,
script : JSON.stringify(script),
},
type : "POST",
success : function(data) {
if (data.success) {
alert("save success");
} else {
alert("save fail:" + data.failedMessage);
}
},
dataType:"json"
});
}
}, editor.cancel = function() {
if (codeEditor != null && treeEditor != null) {
codeEditor.set(editor.originalData);
/* treeEditor.set(editor.originalData); */
}
};
function setTab(name, m, n) {
for (var i = 1; i <= n; i++) {
var menu = document.getElementById(name + i);
var showDiv = document.getElementById("cont_" + name + "_" + i);
menu.className = i == m ? "on" : "";
showDiv.style.display = i == m ? "block" : "none";
}
}
function toggleAPI() {
$("#apiDocumentation").slideToggle();
if ($("#icon-user").attr("class") == "icon-chevron-down") {
$("#icon-user").attr("class", "icon-chevron-up");
} else {
$("#icon-user").attr("class", "icon-chevron-down");
}
}
function refresh(){
location.replace(location) ;
}

1
Bench4Q-Web/src/main/webapp/script/ScriptEditor/paramInfosForm.js
View File

@ -1,4 +1,3 @@
// data 为List<ParamInfoModel> paramInfoModels;
function createPluginsOrBehaviorsForm(data, behaviorIndex) {
var paramInfoList = new Array();// ParamInfoModel
var fieldHTML = "";

8
Bench4Q-Web/src/main/webapp/script/ScriptEditor/plugin.js
View File

@ -1,8 +0,0 @@
function setTab(name, m, n) {
for (var i = 1; i <= n; i++) {
var menu = document.getElementById(name + i);
var showDiv = document.getElementById("cont_" + name + "_" + i);
menu.className = i == m ? "on" : "";
showDiv.style.display = i == m ? "block" : "none";
}
}

3
Bench4Q-Web/src/main/webapp/script/ScriptEditor/usePluginEditor.js
View File

@ -1,6 +1,3 @@
$(document).ready(function() {
});
var Plugin = function(containerManager) {
this.pluginList = null;

2
Bench4Q-Web/src/main/webapp/script/admin/agentManage.js
View File

@ -38,7 +38,7 @@ function loadAgents(table) {
$(tbody).on('click', 'td a.delete', function() {
var row = $(this).closest("tr");
var hostName = $(tr).children("td").eq(0).text();
var id = $(tr).attr("id");
var id = $(row).attr("id");
deleteAgent(id, hostName, row);
});

1
Bench4Q-Web/src/main/webapp/script/admin/portManage.js
View File

@ -50,6 +50,7 @@ function loadPorts(table) {
var tbody = table.table().body();
$(tbody).on('click', ' td a.delete', function() {
var row = $(this).closest('tr');
row=table.row(row);
var portId=row.data()[0];
deletePort(row,portId);
});

2
Bench4Q-Web/src/main/webapp/script/script.js
View File

@ -13,7 +13,7 @@ function startServer() {
function(data) {
if(data.success){
server = data.server;
$('#scriptInfo').text( "Please use the proxy with the IP:"+server.hostNameString
$('#scriptInfo').text( "Please use the proxy with the IP:133.133.133.87"
+ " and the port: "
+ server.port
+ " to record the script.");

2
Bench4Q-Web/src/main/webapp/script/scriptListManage.js
View File

@ -54,5 +54,5 @@ function deleteScript(scriptId,row) {
}, "json");
}
function editScript(scriptId,scriptName) {
window.open("script-edit.jsp?name=" + scriptName + "&scriptId=" + scriptId);// need
window.open("editor.jsp?name=" + scriptName + "&scriptId=" + scriptId);// need
}

8
Bench4Q-Web/src/main/webapp/script/testResult/behaviorResult.js
View File

@ -78,9 +78,7 @@ function Behavior() {
}
this.createDetailTable = function(url, detailDatas) {
var theader = [ "url", "statusCode", "count", "contentLength",
"minResponseTime", "maxResponseTime",
"totalResponseTimeThisTime" ];
var theader=[ $.i18n.prop('result-url'), $.i18n.prop('result-url-statusCode'), $.i18n.prop('result-url-count'), $.i18n.prop('result-url-contentLength'), $.i18n.prop('result-url-minRes'), $.i18n.prop('result-url-maxRes'), $.i18n.prop('result-url-totalRes')];
var table = $("<table></table>");
table.addClass("innerTable");
$(table).attr("style", "width: 100%;");
@ -89,7 +87,7 @@ function Behavior() {
var tr = $("<tr></tr>");
for ( var i = 0; i < theader.length; i++) {
var th = $("<th>" + theader[i] + "</th>");
th.attr("style", "width: ;");
th.attr("style", "width:10% ;");
tr.append(th);
}
thead.append(tr);
@ -106,7 +104,7 @@ function Behavior() {
this.createDetailRow = function(detailData, url, theader) {
var tr = $("<tr></tr>");
var dataArray = extractRowDataActionBefore(detailData, theader, null);
var dataArray = [url,detailData.statusCode,detailData.count,detailData.contentLength,detailData.minResponseTime,detailData.maxResponseTime,detailData.totalResponseTimeThisTime];
dataArray[0] = url;
for ( var i = 0; i < dataArray.length; i++) {
var td = $("<td></td>");