refactor

Bench4Q-Web/src/main/java/org/bench4q/web/service/CommunicateWithMaster.java

@@ -12,6 +12,7 @@ import javax.xml.bind.JAXBException;
 import org.apache.log4j.Logger;
 import org.bench4q.share.communication.HttpRequester;
 import org.bench4q.share.communication.HttpRequester.HttpResponse;
+import org.bench4q.share.helper.ExceptionLog;
 import org.bench4q.share.models.ErrorResponseModel;
 import org.bench4q.web.api.BaseControllerService;
 import org.bench4q.web.exception.CustomGenericException;
@@ -95,14 +96,15 @@ public class CommunicateWithMaster {
 				logger.info(httpResponse.getContent());
 				throw new CustomGenericException("1", BADHTTPRESPONSE, caller);
 			}
+			logger.info(httpResponse.getContent());
 			Object responseObject = ObjectXmlExchange.fromXml(objectClass,
 					httpResponse.getContent());
 			return responseObject;
 		} catch (IOException e) {
-			logger.error(e, e.fillInStackTrace());
+			logger.error(ExceptionLog.getStackTrace(e));
 			throw new CustomGenericException("1", this.IOEXCEPTION, caller);
 		} catch (JAXBException e) {
-			logger.error(e, e.fillInStackTrace());
+			logger.error(ExceptionLog.getStackTrace(e));
 			throw new CustomGenericException("1", this.JAXBEXCEPTION,
 					"get networks_" + caller);
 		}
@@ -134,14 +136,15 @@ public class CommunicateWithMaster {
 				logger.info(httpResponse.getContent());
 				throw new CustomGenericException("1", BADHTTPRESPONSE, caller);
 			}
+			logger.info(httpResponse.getContent());
 			Object responseObject = ObjectXmlExchange.fromXml(objectClass,
 					httpResponse.getContent());
 			return responseObject;
 		} catch (IOException e) {
-			logger.error(e, e.fillInStackTrace());
+			logger.error(ExceptionLog.getStackTrace(e));
 			throw new CustomGenericException("1", this.IOEXCEPTION, caller);
 		} catch (JAXBException e) {
-			logger.error(e, e.fillInStackTrace());
+			logger.error(ExceptionLog.getStackTrace(e));
 			throw new CustomGenericException("1", this.JAXBEXCEPTION,
 					"get networks_" + caller);
 		}

Bench4Q-Web/src/main/resources/ipConfig.properties

@@ -1 +1 @@
-masterAddress=133.133.12.1:7979/
+masterAddress=127.0.0.1:7979/

Bench4Q-Web/src/main/webapp/agentManage.jsp

@@ -6,7 +6,7 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <title>Agent manage</title>
 <link id="bs-css" href="css/bootstrap-cerulean.css" rel="stylesheet">
-<link rel="shortcut icon" href="image/bench4q-png">
+<link rel="shortcut icon" href="img/bench4q.png">
 <link href="css/bootstrap-responsive.css" rel="stylesheet">
 <link href="css/charisma-app.css" rel="stylesheet">
 <link href="css/jquery-ui-1.8.21.custom.css" rel="stylesheet">

Bench4Q-Web/src/main/webapp/css/index.css

@@ -0,0 +1,74 @@
+.header {
+	background: -webkit-linear-gradient(#839ba9, #405a6a);
+	padding: 10px 0 12px 0;
+	text-align: center;
+	font-size: 16px;
+	font-weight: normal;
+	color: #fff;
+	margin-top: 20px;
+}
+
+.content {
+	margin-top: 20px;
+}
+
+.picture {
+	margin-left: 20px;
+}
+
+.partner {
+	border: 10px;
+	height: 30px;
+	align: center;
+}
+
+.partner-item {
+	width: 12%;
+	height: 100%;
+	boder-right: 2%;
+	padding-top: 8px;
+	float: left;
+}
+
+.introduce {
+	float: center;
+	margin-right: 20px;
+	width: 100%;
+}
+
+.clear {
+	clear: both;
+}
+
+.text {
+	width: 100%;
+	border: 1px #cbcaca solid;
+	padding-bottom: 10px;
+}
+
+.right-text {
+	width: 45%;
+	float: right;
+}
+
+.left-text {
+	width: 48%;
+	float: left;
+	height: auto;
+	padding: 3px;
+}
+
+.button {
+	height: 140px;
+	float: center;
+	width: 100%;
+	margin-top: 20px;
+}
+
+.register {
+	padding-top: 20px;
+}
+
+.bottom {
+	height: 200px;
+}

Bench4Q-Web/src/main/webapp/css/jquery.iphone.toggle.css

@@ -0,0 +1,145 @@
+.iPhoneCheckContainer {
+  position: relative;
+  height: 27px;
+  cursor: pointer;
+  overflow: hidden; }
+  .iPhoneCheckContainer input {
+    position: absolute;
+    top: 5px;
+    left: 30px;
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+    opacity: 0; }
+  .iPhoneCheckContainer label {
+    white-space: nowrap;
+    font-size: 17px;
+    line-height: 17px;
+    font-weight: bold;
+    font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+    cursor: pointer;
+    display: block;
+    height: 27px;
+    position: absolute;
+    width: auto;
+    top: 0;
+    padding-top: 5px;
+    overflow: hidden; }
+  .iPhoneCheckContainer, .iPhoneCheckContainer label {
+    user-select: none;
+    -moz-user-select: none;
+    -khtml-user-select: none; }
+
+.iPhoneCheckDisabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5; }
+
+label.iPhoneCheckLabelOn {
+  color: white;
+  background: url('../img/iphone-style-checkboxes/on.png?1284697268') no-repeat;
+  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
+  left: 0;
+  padding-top: 5px; }
+  label.iPhoneCheckLabelOn span {
+    padding-left: 8px; }
+label.iPhoneCheckLabelOff {
+  color: #8b8b8b;
+  background: url('../img/iphone-style-checkboxes/off.png?1284697268') no-repeat right 0;
+  text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
+  text-align: right;
+  right: 0; }
+  label.iPhoneCheckLabelOff span {
+    padding-right: 8px; }
+
+.iPhoneCheckHandle {
+  display: block;
+  height: 27px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  background: url('../img/iphone-style-checkboxes/slider_left.png?1284697268') no-repeat;
+  padding-left: 3px; }
+
+.iPhoneCheckHandleRight {
+  height: 100%;
+  width: 100%;
+  padding-right: 3px;
+  background: url('../img/iphone-style-checkboxes/slider_right.png?1284697268') no-repeat right 0; }
+
+.iPhoneCheckHandleCenter {
+  height: 100%;
+  width: 100%;
+  background: url('../img/iphone-style-checkboxes/slider_center.png?1284697268'); }
+
+.iOSCheckContainer {
+  position: relative;
+  height: 27px;
+  cursor: pointer;
+  overflow: hidden; }
+  .iOSCheckContainer input {
+    position: absolute;
+    top: 5px;
+    left: 30px;
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+    opacity: 0; }
+  .iOSCheckContainer label {
+    white-space: nowrap;
+    font-size: 17px;
+    line-height: 17px;
+    font-weight: bold;
+    font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+    cursor: pointer;
+    display: block;
+    height: 27px;
+    position: absolute;
+    width: auto;
+    top: 0;
+    padding-top: 5px;
+    overflow: hidden; }
+  .iOSCheckContainer, .iOSCheckContainer label {
+    user-select: none;
+    -moz-user-select: none;
+    -khtml-user-select: none; }
+
+.iOSCheckDisabled {
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  opacity: 0.5; }
+
+label.iOSCheckLabelOn {
+  color: white;
+  background: url('../img/ios-style-checkboxes/on.png?1284697268') no-repeat;
+  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
+  left: 0;
+  padding-top: 5px; }
+  label.iOSCheckLabelOn span {
+    padding-left: 8px; }
+label.iOSCheckLabelOff {
+  color: #8b8b8b;
+  background: url('../img/ios-style-checkboxes/off.png?1284697268') no-repeat right 0;
+  text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
+  text-align: right;
+  right: 0; }
+  label.iOSCheckLabelOff span {
+    padding-right: 8px; }
+
+.iOSCheckHandle {
+  display: block;
+  height: 27px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  background: url('../img/ios-style-checkboxes/slider_left.png?1284697268') no-repeat;
+  padding-left: 3px; }
+
+.iOSCheckHandleRight {
+  height: 100%;
+  width: 100%;
+  padding-right: 3px;
+  background: url('../img/ios-style-checkboxes/slider_right.png?1284697268') no-repeat right 0; }
+
+.iOSCheckHandleCenter {
+  height: 100%;
+  width: 100%;
+  background: url('../img/ios-style-checkboxes/slider_center.png?1284697268'); }

Bench4Q-Web/src/main/webapp/homepage.jsp

@@ -16,8 +16,9 @@
 <link href="css/charisma-app.css" rel="stylesheet">
 <link href="css/jquery-ui-1.8.21.custom.css" rel="stylesheet">
 <link href='css/colorbox.css' rel='stylesheet'>
+<link href='css/noty_theme_default.css' rel='stylesheet'>
 <link href='css/opa-icons.css' rel='stylesheet'>
-<link rel="shortcut icon" href="image/bench4q-png">
+<link rel="shortcut icon" href="img/bench4q.png">
 <link href="bench4q-css/bench4q.css" rel="stylesheet">
 
 </head>

Bench4Q-Web/src/main/webapp/iframe/navbar.html

@@ -0,0 +1,33 @@
+<html>
+<head>
+<link href="/css/bootstrap.css" rel="stylesheet">
+<link href="/bench4q-css/navbar.css" rel="stylesheet">
+</head>
+<body>
+
+<header class="navbar navbar-inverse navbar-fixed-top app-nav ">
+	<div class="container">
+		<div class="navbar-header">
+			<a href="index.jsp" class="navbar-brand brand"><img alt="Bench4Q Logo"
+				src="/img/bench4q.png" /> <span>Bench4Q</span></a>
+		</div>
+		 <nav class="nav nav-pills navbar-collapse bs-navbar-collapse">
+			<ul class="nav navbar-nav">
+				<li><a href="../getting-started">My tests</a></li>
+				<li><a href="../css">Test Configration</a></li>
+				<li><a href="../components">Scripts</a></li>
+				<li><a href="../javascript">Test Schedule</a></li>
+				<li><a href="../customize">Customize</a></li>
+			</ul>
+			<ul class="nav navbar-nav navbar-right">
+        <li>
+          <a href="../about">Sign In</a>
+        </li>
+      </ul>
+    </nav>
+	</div>
+	</header>
+	<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
+	<script src="/js/bootstrap.min.js"></script>
+	</body>
+</html>

Bench4Q-Web/src/main/webapp/img/.gitignore

@@ -0,0 +1 @@
+/Thumbs.db

Bench4Q-Web/src/main/webapp/img/ajax-loaders/.gitignore

@@ -0,0 +1 @@
+/Thumbs.db

Bench4Q-Web/src/main/webapp/img/gallery/.gitignore

@@ -0,0 +1,2 @@
+/Thumbs.db
+/thumbs