merge the new branch to master step 1

This commit is contained in:
Tienan Chen 2013-09-05 10:23:35 +08:00
parent 0ed56b3e0d
commit 2db0d035bd
32 changed files with 0 additions and 1678 deletions

4
.gitignore vendored
View File

@ -1,4 +0,0 @@
.classpath
.project
/.settings
/target

View File

@ -1,4 +0,0 @@
Bench4Q-Web
===========
Web Management Console of Bench4Q

55
pom.xml
View File

@ -1,55 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.bench4q</groupId>
<artifactId>bench4q-web</artifactId>
<packaging>war</packaging>
<version>0.0.1-SNAPSHOT</version>
<name>Bench4Q Web</name>
<description>Bench4Q Web</description>
<organization>
<name>TCSE, ISCAS</name>
</organization>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.2.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.12</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.0.3.v20130506</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
<finalName>bench4q-web</finalName>
</build>
</project>

View File

@ -1,25 +0,0 @@
package org.bench4q.web.controller;
import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
@Controller
@RequestMapping("/")
public class HomeController {
@RequestMapping(value = "/", method = { RequestMethod.GET })
@ResponseBody
public String index() {
return "It works!";
}
@RequestMapping(value = "/demo", method = { RequestMethod.GET })
public ModelAndView d(HttpServletRequest request) {
request.setAttribute("Test", "Abc");
return new ModelAndView("demo");
}
}

View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan base-package="org.bench4q" />
<mvc:annotation-driven />
<bean
class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/views/" />
<property name="suffix" value=".jsp" />
</bean>
<mvc:default-servlet-handler />
</beans>

View File

@ -1,13 +0,0 @@
<%@ page language="java" contentType="text/html; charset=utf-8"
pageEncoding="utf-8"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Demo</title>
</head>
<body>
It works!
<%=request.getAttribute("Test")%>
</body>
</html>

View File

@ -1,22 +0,0 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
<display-name>Bench4Q Web</display-name>
<servlet>
<servlet-name>dispatcherServlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>
classpath*:/org/bench4q/web/config/application-context.xml
</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>dispatcherServlet</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
</web-app>

File diff suppressed because it is too large Load Diff

View File

@ -1,89 +0,0 @@
@CHARSET "UTF-8";
.regdiv1 {
margin:20px auto;
width:958px;
height:600px;
background-color:#efefef;
}
regtable1{
width:100% ;
height:100%;
border:0;
}
.regtable2{
width:100%;
height:50px;
border:0;
align:center;
cellpadding:0;
background-color:#efefef
}
.regtable3{
width:100%;
height:300px;
border:0;
}
.regtable4{
width:100%;
height:400px;
border:0;
cellpadding:0;
background-color:#efefef;
}
.regtr1{
height:50px;
width:100%;
}
.regtr2{
width:100%;
height:100px;
}
.regtd1{
width:10%;
height:50px;
text-align:right;
}
.regtd2{
width:20%;
height:50px;
text-align:right;
background-color:#efefef;
}
.regtd3{
width:25%;
height:50px;
text-align:right;
background-color:#efefef;
}
.regtd4{
width:55%;
height:50px;
text-align:right;
background-color:#efefef;
}
.regtd5{
text-align:center;
background-color:#efefef;
colspan:2;
}

View File

@ -1,139 +0,0 @@
body,html,h3,div,p,tr,td,input,ul,li,h2,h4{ margin:0; padding:0;}
body{ font-size:13px; font-family:Verdana, Geneva, sans-serif; color:#000000;}
html,body{ }
.fl{ float:left;_display:inline;}
.fr{ float:right;_display:inline;}
li{ list-style:none;}
a{ text-decoration:none;}
a:hover{ text-decoration:underline;}
.wrapper{ width:1003px; margin:0 auto; }
.myclear{ overflow:hiddenl;zoom:1;}
.header{ height:117px; width:1003px; background:url(../images/banner.jpg) no-repeat 0 0; border-bottom:2px solid #A4CBEC;}
.sidebar{ width:127px;}
/*header*/
.header{ font-size:14px; color:#fff; position:relative;}
.top_nav{ margin-top:3px; margin-right:3px;}
.top_nav a{ color:#fff; margin-left:15px; text-decoration:underline;}
.topnav2{ position:absolute;right:3px; bottom:3px;}
/*right*/
.main{ background:url(../images/mainbg.jpg) repeat-y 0 0;overflow:hidden;zoom:1; border-bottom:2px solid #A4CBEC; padding-bottom:60px;}
/*sidebar*/
.sidebar{ }
.sidebar ul{ margin-left:13px; padding-top:25px;}
.sidebar ul li{ margin-bottom:3px;}
.sidebar ul li a{ display:block; width:114px; height:35px; line-height:300px;overflow:hidden;zoom:1; background:url(../images/nav.gif) no-repeat;}
.sidebar ul li.n_01 a{ background-position:0 0;}
.sidebar ul li.n_02 a{ background-position:0 -38px;}
.sidebar ul li.n_03 a{ background-position:0 -76px;}
.sidebar ul li.n_04 a{ background-position:0 -114px;}
.sidebar ul li.n_05 a{ background-position:0 -152px;}
.sidebar ul li.n_01 a.cur{ background-position:-121px 0;}
.sidebar ul li.n_02 a.cur{ background-position:-121px -38px;}
.sidebar ul li.n_03 a.cur{ background-position:-121px -76px;}
.sidebar ul li.n_04 a.cur{ background-position:-121px -114px;}
.sidebar ul li.n_05 a.cur{ background-position:-121px -152px;}
/*sidebar2*/
.main2{ background:url(../images/mainbg2.jpg) repeat-y 0 0; overflow:hidden;zoom:1; border-bottom:2px solid #A4CBEC;}
.sidebar2{ }
.sidebar2 ul{ margin-left:13px; padding-top:25px;}
.sidebar2 ul li{ display:block; margin-bottom:4px;}
.sidebar2 ul li a{ display:block; width:84px; height:26px; line-height:300px;overflow:hidden;zoom:1; background:url(../images/nav.gif) no-repeat;}
.sidebar2 ul li.n_01 a{ background-position:-13px -215px;}
.sidebar2 ul li.n_02 a{ background-position:-13px -245px;}
.sidebar2 ul li.n_03 a{ background-position:-13px -275px;}
.sidebar2 ul li.n_01 a.cur{ background-position:-151px -215px;}
.sidebar2 ul li.n_02 a.cur{ background-position:-151px -245px;}
.sidebar2 ul li.n_03 a.cur{ background-position:-151px -275px;}
/*right*/
.right{ width:866px; margin-left:10px; padding-top:20px;}
.r_menu{ height:35px; padding-left:20px;background:url(../images/r_nav_bg.jpg) repeat-x 0 30px;}
.r_menu a{display:inline-block; float:left;margin-right:10px;margin-top:3px; background:url(../images/bg.gif) no-repeat 0 -100px; font-size:16px; font-weight:bold; color:#688DCF;height:27px;line-height:27px;}
.r_menu a:hover,.r_menu a.cur{ text-decoration:none; background-position:0 -154px; color:#fff;height:31px;line-height:31px; margin-top:0;}
.r_menu a:hover span,.r_menu a.cur span{ background-position:right -186px;height:31px; cursor:pointer;}
.r_menu a span{display:inline-block; padding:0 15px;background:url(../images/bg.gif) no-repeat;height:27px;line-height:27px;}
.r_menu a span{ background-position:right -127px;}
/*r_main*/
.r_main .tb{ width:800px; margin-left:20px; margin-top:10px;}
.r_main .tb td{ padding:5px 5px 7px 0; font-size:14px; text-align:right;}
.r_main .tb td select{ width:110px; height:20px; padding:2px;border:1px solid #A4CBEC;}
.search_box{ width:290px; height:18px; line-height:18px; border:1px solid #A4CBEC;}
.r_main .tb td.text_left{ text-align:left;}
/*btn*/
.btn_bar{ width:800px; margin-left:20px; margin-top:30px;}
.btn_bar a{ margin-right:10px; line-height:21px;}
.btn_blue a{display:inline-block;background:url(../images/bg.gif) no-repeat 0 0; color:#fff; font-size:14px; text-decoration:none;}
.btn_blue a span{ display:inline-block; height:21px; line-height:21px;padding:2px 12px;background:url(../images/bg.gif) right -25px;cursor:pointer;}
.orange a{display:inline-block;background:url(../images/bg.gif) no-repeat 0 -50px; color:#fff; font-size:14px; text-decoration:none;}
.orange a span{ display:inline-block;cursor:pointer;height:21px;line-height:21px; padding:2px 12px;background:url(../images/bg.gif) right -75px;}
.tb2{ border-collapse:collapse; margin-top:30px; margin-left:20px; width:800px;}
.tb2 th{ background:#D4EEFF; color:#676664; font-size:14px; padding:7px 4px; border:1px solid #fff;}
.tb2 td{ border:1px solid #fff; background:#F5F5F5; padding:7px 4px;}
.pagebar{ margin-top:10px; margin-left:20px; font-size:14px;}
.pagebar select{ border:1px solid #7F9DB9; width:50px; height:20px; margin-right:2px;}
.pagebar span{ margin-right:10px;}
.p_next em{ font-style:normal;}
.p_next em{ margin:0 5px;}
.p_next em a{ color:#3D6DC2;}
.pagebar em{ margin-left:10px;}
.pagebar em span{ font-style:normal; margin-right:0;}
.page_text{ border:1px solid #7F9DB9; padding:3px; width:20px; margin:0 5px;line-height:21px;}
.gray{ color:#999999;}
.box1{ margin-bottom:25px; margin-left:20px; font-size:14px;}
.box1 p{ line-height:28px;}
.p1{ text-indent:13px;}
/*tb_t1*/
.tb_t1 input{width:170px; height:18px; line-height:18px; border:1px solid #A4CBEC;}
.top_tab{ height:30px; margin-top:15px;}
.top_tab .btn_blue a{ margin-left:10px;}
.tb3 .btn_blue a{ margin-left:5px;}
.tb3{ font-size:14px; text-align:left;}
.tb3 th{ background:#D4EEFF; color:#666563; padding:4px 10px;}
.tb3 td{ padding:4px;padding:4px 10px;}
.tb3 .odd td{ background:#F5F5F5;}
.r_main .tb_btn td{ padding-top:20px;}
.r_main .tb_btn td .orange{ margin-right:20px;}
.tb_t3 tr td input{width:108px; height:18px; border:1px solid #A4CBEC;}
.tips,.tit1{font-size:14px; margin-bottom:5px; margin-left:20px;}
.tit1{ color:#666666; margin-top:20px; }
.btn_bar2{ margin:20px 0 0 20px;}
.btn_bar2 .orange{ margin-right:20px;}
/*m_main*/
.m_main{ font-size:14px; width:630px; margin-left:80px; margin-top:30px;}
.m_main p{ color:#FE7701; margin-bottom:5px;}
.m_main .tb_t3 td{ padding:10px 0;}
.m_main .tb_t3 .p_color a{ color:#3E6CC4;}
.m_main .tb_t3 select{ border:1px solid #A4CBEC;height:20px;padding:2px;width:110px;}
/*m_r_right*/
.m_r_right{ margin:5px 0 0 10px; width:886px; /*overflow:hidden;*/ padding-bottom:60px;}
.m_r_right h2{ text-align:center; font-size:18px; text-align:center;font-weight:bold; color:#2B7CCB;}
.paper_tit{ background:#D4EEFF; color:#656764; font-size:14px; height:24px; line-height:24px; padding-left:10px; margin-bottom:7px;}
.test_time{ color:#999; font-size:14px; line-height:28px; text-align:center; margin-bottom:5px;}
.m_r_right .btn_blue{ margin-top:30px;}
.test_box{ font-size:14px;}
.test_box h4{ font-size:14px; font-weight:normal; line-height:30px; margin-bottom:5px;}
.test_box p span{ margin-right:30px;}
.test_box p{ line-height:28px;}
.test_box p input{ margin-right:4px;}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

View File

@ -1,5 +0,0 @@
<html>
<body>
<h2>Hello World!</h2>
</body>
</html>

View File

@ -1,59 +0,0 @@
function clean() {
document.getElementsByName('username')[0].value="";
document.getElementsByName('password')[0].value="";
document.getElementsByName('retype_password')[0].value="";
}
function password_validation() {
var null_flag=0;
var user_name = document.getElementsByName('username')[0].value;
var retype_pwd = document.getElementsByName('retype_password')[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;}
if(input_pwd==""){
$('#pwdmsg').show();
document.getElementsByName('password')[0].value="";
document.getElementsByName('password')[0].style.border="1px solid red";
null_flag=1;}
if((null_flag==0)&&(input_pwd==retype_pwd)) fm.submit();
else{
$('#rtpmsg').show();
document.getElementsByName('retype_password')[0].value="";
document.getElementsByName('retype_password')[0].style.border="1px solid red";
}
}
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();
}
}

View File

@ -1,133 +0,0 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="css/register.css">
<link rel="stylesheet" href="css/common.css">
<script type="text/javascript" src="js/register.js"></script>
<title>register</title>
</head>
<body>
<img alt="GitHub" class="github-logo-4x"
src="images/register/bench4q-1.png" height="30">
<img alt="GitHub" class="github-logo-4x-hover"
src="images/register/bench4q-2.png" height="30">
<ul>
<li class="login"><a href="userlogin.jsp">login</a></li>
</ul>
<h1>Bench4Q is a new methodology for QoS benchmarking</h1>
<table>
</table>
<div class="regdiv1">
<form id="fm" name="fm" action="Regester/register" method="post">
<table class="regtable1">
<tr>
<td align="center"><table class="regtable2"></table></td>
</tr>
<tr>
<td>
<table class="regtable3">
<tr>
<td style="width: 50%;">
<table class="regtable1">
<tr class="regtr1">
<td><img src="images/register/tips.jpg"></td>
</tr>
<tr class="regtr1"></tr>
</table>
<table class="regtable3">
<tr>
<td class="regtd1"><img
src="images/register/username.jpg"></td>
<td class="regtd2">UserName:</td>
<td class="regtd3"><input style="height: 20px"
tabindex="1" type="text" name="username"
onChange="javascript:form_validation('username')" /></td>
<td class="regtd4">
<table>
<tr id="usrmsg" style="display: none;">
<td style="width: 20%;"><img
src="images/register/cuowu.jpg" /></td>
<td style="width: 80%;">the UserName must be <br>5-20
letters or numbers
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="regtd1"><img
src="images/register/password.jpg" /></td>
<td class="regtd2">Password:</td>
<td class="regtd3"><input style="height: 20px"
name="password" tabindex="1" type="password"
onChange="javascript:form_validation('password')" /></td>
<td class="regtd4">
<table>
<tr id="pwdmsg" style="display: none;">
<td style="width: 20%;"><img
src="images/register/cuowu.jpg" /></td>
<td style="width: 80%;">the Password must be <br>6-20
letters or numbers
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="regtd1"><img src="images/register/retype.jpg" /></td>
<td class="regtd2">Retype Password:</td>
<td class="regtd3"><input style="height: 20px"
name="retype_pwd" tabindex="1" type="password" /></td>
<td class="regtd4">
<table>
<tr id="rtpmsg" style="display: none;">
<td style="width: 20%;"><img
src="images/register/cuowu.jpg" /></td>
<td style="width: 80%;">the password is wrong</td>
</tr>
</table>
</td>
</tr>
<tr style="height: 120px;">
<td class="regtd5"><input type="image" name="Submit"
value="Register" src="images/register/submit.jpg"
onMouseOver="this.src='images/register/submiton.jpg'"
onMouseOut="this.src='images/register/submit.jpg'"
onClick="javascript:password_validation();return false" /></td>
<td class="regtd5"><img name="Clear"
src="images/register/clear.jpg"
onMouseOver="this.src='images/register/clearon.jpg'"
onMouseOut="this.src='images/register/clear.jpg'"
onClick="javascript:clean();return false" /></td>
</tr>
<tr class="regtr2"></tr>
</table>
</td>
<td style="width: 50%;">
<table class="regtable4">
<tr>
<td style="width: 90%;"><img
src="images/register/bench4qblog.jpg" /></td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td><table
style="width: 100%; height: 100px; border: 0; cellpadding: 0; background-color: #efefef;"></table></td>
</tr>
</table>
</form>
</div>
</body>
</html>

View File

@ -1,12 +0,0 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Insert title here</title>
</head>
<body>
</body>
</html>

View File

@ -1,5 +0,0 @@
package org.bench4q.web.test;
public class HomeControllerTest {
}