diff --git a/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_en.properties b/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_en.properties index e610059d..d4198b54 100644 --- a/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_en.properties +++ b/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_en.properties @@ -119,7 +119,7 @@ plugin_jsp_plugins=Plug-ins plugin_jsp_behavior=Behavior plugin_jsp_addScriptName=Please add ScriptName plugin_jsp_scriptName=Script Name: -script_jsp_makeScript=MakeScript +script_jsp_makeScript=ScriptEdit script_jsp_recordScript=RecordScript script_jsp_refresh=RefreshPage test_jsp_makeNewScript=NewScript @@ -143,4 +143,7 @@ login_jsp_passwordWarnning=The password cannot be empty! login_jsp_admin=Admin script_edit_jsp_save=Save script_edit_jsp_cancel=Cancel -script_edit_jsp_validate=Validate \ No newline at end of file +script_edit_jsp_validate=Validate +register_jsp_username=Username +register_jsp_password=Password +register_jsp_retype=Retype Password \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_zh.properties b/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_zh.properties index 8227b116..e3a0108a 100644 --- a/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_zh.properties +++ b/Bench4Q-Web/src/main/webapp/WEB-INF/classes/i18n_zh.properties @@ -120,7 +120,7 @@ plugin_jsp_plugins=\u63D2\u4EF6 plugin_jsp_behavior=\u52A8\u4F5C plugin_jsp_addScriptName=\u8BF7\u8F93\u5165\u811A\u672C\u540D plugin_jsp_scriptName=\u811A\u672C\u540D\uFF1A -script_jsp_makeScript=\u81EA\u5236\u811A\u672C +script_jsp_makeScript=\u811A\u672C\u7F16\u8F91 script_jsp_recordScript=\u5F55\u5236\u811A\u672C script_jsp_refresh=\u5237\u65B0\u9875\u9762 test_jsp_makeNewScript=\u65B0\u5EFA\u811A\u672C @@ -134,7 +134,7 @@ index_jsp_registerAndSign=\u6CE8\u518C\u5E76\u8BA4\u8BC1 index_jsp_weAreFree=\u6211\u4EEC\u662F\u514D\u8D39\u7684\u54DF\uFF01 login_jsp_home=\u4E3B\u9875 login_jsp_register=\u6CE8\u518C -login_jsp_Title=Bench4Q\u662FQOS\u57FA\u51C6\u6D4B\u8BD5\u7684\u65B0\u65B9\u6CD5 +login_jsp_Title=Bench4Q\u2014\u2014QOS\u57FA\u51C6\u6D4B\u8BD5\u7684\u65B0\u65B9\u6CD5 login_jsp_welcome=\u6B22\u8FCE\u4F7F\u7528Bench4Q\uFF01 login_jsp_signIn=\u767B\u5F55 login_jsp_username=\u7528\u6237\u540D @@ -144,4 +144,7 @@ login_jsp_passwordWarnning=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 login_jsp_admin=\u7BA1\u7406\u5458 script_edit_jsp_save=\u4FDD\u5B58 script_edit_jsp_cancel=\u53D6\u6D88 -script_edit_jsp_validate=\u786E\u8BA4 \ No newline at end of file +script_edit_jsp_validate=\u786E\u8BA4 +register_jsp_username=\u7528\u6237\u540D +register_jsp_password=\u5BC6 \u7801 +register_jsp_retype=\u91CD \u8F93 \ No newline at end of file diff --git a/Bench4Q-Web/src/main/webapp/plugin.jsp b/Bench4Q-Web/src/main/webapp/plugin.jsp index 431fb954..3ed99a6f 100644 --- a/Bench4Q-Web/src/main/webapp/plugin.jsp +++ b/Bench4Q-Web/src/main/webapp/plugin.jsp @@ -203,9 +203,7 @@ body { onClick="pluginCancel();" id="pluginCancel"> - -
@@ -239,30 +237,6 @@ body {
- - - -
-
- -

- -

-
-
-

- - -

-
-
- -
-
diff --git a/Bench4Q-Web/src/main/webapp/register.jsp b/Bench4Q-Web/src/main/webapp/register.jsp index 2b910ded..4152265b 100644 --- a/Bench4Q-Web/src/main/webapp/register.jsp +++ b/Bench4Q-Web/src/main/webapp/register.jsp @@ -1,264 +1,292 @@ -<%@page language="java" contentType="text/html; charset=GBK" pageEncoding="GBK"%> +<%@page language="java" contentType="text/html; charset=GBK" + pageEncoding="GBK"%> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - - - Bench4Q - - - - - - - - - - - - - - - - - - - - - - + + +Bench4Q + + + + + + + + - + - - - + function password_validation() { + var null_flag = 0; + var user_name = document.getElementsByName('username')[0].value; + var retype_pwd = document.getElementsByName('retype_pwd')[0].value; + var input_pwd = document.getElementsByName('password')[0].value; + + if (user_name == "") { + $('#usrmsg').show(); + document.getElementsByName('username')[0].value = ""; + document.getElementsByName('username')[0].style.border = "1px solid red"; + null_flag = 1; + } else { + $('#usrmsg').hide(); + document.getElementsByName('username')[0].style.border = ""; + } + + if (input_pwd == "") { + $('#pwdmsg').show(); + document.getElementsByName('password')[0].value = ""; + document.getElementsByName('password')[0].style.border = "1px solid red"; + null_flag = 1; + } else { + $('#pwdmsg').hide(); + document.getElementsByName('password')[0].style.border = ""; + } + if (input_pwd != retype_pwd) { + $('#rtpmsg').show(); + document.getElementsByName('retype_pwd')[0].value = ""; + document.getElementsByName('retype_pwd')[0].style.border = "1px solid red"; + null_flag = 1; + } else { + $('#rtpmsg').hide(); + document.getElementsByName('retype_pwd')[0].style.border = ""; + } + if (null_flag == 0) + register(); + } + + function form_validation(name) { + var input_value = document.getElementsByName(name)[0].value; + var regx = /^[a-zA-Z0-9]+$/; + if (!regx.test(input_value)) { + alert(name + " must be number!"); + if (name == "username") { + $('#usrmsg').show(); + document.getElementsByName('username')[0].value = ""; + document.getElementsByName('username')[0].style.border = "1px solid red"; + } + + else if (name == "password") { + $('#pwdmsg').show(); + document.getElementsByName('password')[0].value = ""; + document.getElementsByName('password')[0].style.border = "1px solid red"; + } + } else { + document.getElementsByName(name)[0].style.border = "1px solid #ddd"; + if (name == "username") + $('#usrmsg').hide(); + else if (name == "password") + $('#pwdmsg').hide(); + //else $('#rtpmsg').hide(); + } + } + - -
+ +
- - - - +
    -
    -
    -
    -
    -

    -Bench4Q is a new methodology for QoS benchmarking -

    -
    -
    -
    -
    + +
-
+
-
- - - - - - - - - - -
- - - - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
Username: - - - - -
-
Password: - - - - -
-
Retype Password: - - - - -
-
- - - -
- 		- - - - -
-
-
-
- -
+
+
+
+
+
+

Bench4Q is a new methodology for QoS benchmarking

+
+
+
+
+ +
+ +
+ + + + + + + + + + +
+ + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
: + + + + + +
+
: + + + + + +
+
: + + + + + +
+
+ + +
+ 		+ + + + +
+
+
+
+ +
diff --git a/Bench4Q-Web/src/main/webapp/script/plugin-new.js b/Bench4Q-Web/src/main/webapp/script/plugin-new.js index 47ab64b0..e6c374c3 100644 --- a/Bench4Q-Web/src/main/webapp/script/plugin-new.js +++ b/Bench4Q-Web/src/main/webapp/script/plugin-new.js @@ -180,7 +180,7 @@ function show(plugin, method) { p.setAttribute("style", "cursor:pointer;"); p.appendChild(textNode); div.appendChild(p); - + document.getElementById('behaviorArea').appendChild(div); loadMethodParams(behaviorData, index); index++; @@ -286,8 +286,12 @@ function loadMethodParams(behaviorData, behaviorIndex) { + boxHeader + "
" + fieldHTML - + "
" - + "  
"; + + "
" + + "  
"; document.getElementById("showPluginMethod").innerHTML += documentHtml; }); } @@ -330,9 +334,11 @@ function createMultiField(label, name, size, behaviorIndex) { var labelNode = document.createTextNode(name + ":" + label); var div = document.createElement("div"); var addFieldButton = document.createElement("button"); - var addFieldNode = document.createTextNode($.i18n.prop("plugin_jsp_addField")); + var addFieldNode = document.createTextNode($.i18n + .prop("plugin_jsp_addField")); var removeFieldButton = document.createElement("button"); - var removeFieldNode = document.createTextNode($.i18n.prop("plugin_jsp_removeField")); + var removeFieldNode = document.createTextNode($.i18n + .prop("plugin_jsp_removeField")); var br = document.createElement("br"); var table = document.createElement("table"); @@ -420,7 +426,8 @@ function createTable(methodParamModel, cols, behaviorIndex) { var addColButton = document.createElement("button"); var addColNode = document.createTextNode($.i18n.prop("plugin_jsp_addCol")); var removeColButton = document.createElement("button"); - var removeColNode = document.createTextNode($.i18n.prop("plugin_jsp_removeCol")); + var removeColNode = document.createTextNode($.i18n + .prop("plugin_jsp_removeCol")); var table = document.createElement("table"); var thead = document.createElement("thead"); var tbody = document.createElement("tbody"); @@ -534,72 +541,58 @@ function saveBehavior(selectedNode) { type = "USERBEHAVIOR"; } var parameters = new Array(); - for (var i = 0; i < length; i++) - { + for (var i = 0; i < length; i++) { var node = div[i]; var nodeId = $(node).attr("id").split("_"); behaviorIndex = nodeId[0]; var parameterModel; - var key = "", value = "",temp=""; - if ($(node).attr("class") == "Field sample_frame") - { + var key = "", value = "", temp = ""; + if ($(node).attr("class") == "Field sample_frame") { key = node.lastChild.firstChild.nodeValue; - temp= $(node).find("input").val(); - if(temp!="") - { + temp = $(node).find("input").val(); + if (temp != "") { value = temp; } - } - else if ($(node).attr("class") == "MultiField sample_frame") - { + } else if ($(node).attr("class") == "MultiField sample_frame") { key = node.firstChild.firstChild.nodeValue.split(":")[0]; var fieldNode = $(node).find("table").children(); var fieldLength = $(fieldNode).length; for (var j = 0; j < fieldLength; j++) { - temp=$(fieldNode[j]).find("input").val(); - if(temp!="") - { + temp = $(fieldNode[j]).find("input").val(); + if (temp != "") { value = temp + ";"; } } - } - else if ($(node).attr("class") == "Table sample_frame") - { + } else if ($(node).attr("class") == "Table sample_frame") { key = node.lastChild.firstChild.nodeValue; var table = $(node).find("table"); var col = table.find("th").length; var row = table.find("tbody").children().length; var tbody = $(node).find("tbody"); - for (var m = 0; m < row; m++) - { - for (var n = 0; n < col; n++) - { + for (var m = 0; m < row; m++) { + for (var n = 0; n < col; n++) { var rowNode = $(tbody).children()[m]; var colNode = $(rowNode).children()[n]; - temp=$(colNode).find("input").val(); - if(temp!="") - { + temp = $(colNode).find("input").val(); + if (temp != "") { value += temp + "|"; } } - if(value!="") - { + if (value != "") { value += ";"; } } - } - else if ($(node).attr("class") == "CheckBox sample_frame") - { + } else if ($(node).attr("class") == "CheckBox sample_frame") { key = node.lastChild.firstChild.nodeValue; var id = $(node).attr("id"); $('input[name=' + id + ']:checked').each(function() { - temp=$(this).val(); - if(temp!=""){ + temp = $(this).val(); + if (temp != "") { value += temp + ";"; } }); } - if(value!=""){ + if (value != "") { parameterModel = new ParameterModel(key, value); parameters.push(parameterModel); } @@ -611,23 +604,23 @@ function saveBehavior(selectedNode) { } var usePluginList = new Array(); function submitBehaviors(selectedNode) { - var scriptName=$(selectedNode.parentNode.parentNode).find("input").val(); - if(scriptName==null||scriptName==""){ + var scriptName = $(selectedNode.parentNode.parentNode).find("input").val(); + if (scriptName == null || scriptName == "") { alert("Please input scriptName."); return; } - if(behaviors.length==0){ + if (behaviors.length == 0) { alert("Please save the behavior or fill in the form."); return; } - for (var i = 0; i < pluginChoosedList.length; i++) - { - var usePluginModel = new UsePluginModel(i, pluginChoosedList[i], new Array()); + for (var i = 0; i < pluginChoosedList.length; i++) { + var usePluginModel = new UsePluginModel(i, pluginChoosedList[i], + new Array()); usePluginList.push(usePluginModel); } var scriptModel = new PluginEditScriptRequestModel(behaviors, usePluginList, scriptName); - + $.ajax({ type : "POST", url : "uploadPluginEditedScript", diff --git a/Bench4Q-Web/src/main/webapp/test.jsp b/Bench4Q-Web/src/main/webapp/test.jsp index 42945790..5eda4d52 100644 --- a/Bench4Q-Web/src/main/webapp/test.jsp +++ b/Bench4Q-Web/src/main/webapp/test.jsp @@ -165,7 +165,7 @@ body { onClick="addScenario();checkUserScenarios()"> -