Merge branch 'master' of https://github.com/lostcharlie/Bench4Q.git

Bench4Q-Agent/src/main/java/hbase-site.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<!-- /** * * Licensed to the Apache Software Foundation (ASF) under one * 
-	or more contributor license agreements. See the NOTICE file * distributed 
-	with this work for additional information * regarding copyright ownership. 
-	The ASF licenses this file * to you under the Apache License, Version 2.0 
-	(the * "License"); you may not use this file except in compliance * with 
-	the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 
-	* * Unless required by applicable law or agreed to in writing, software * 
-	distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT 
-	WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the 
-	License for the specific language governing permissions and * limitations 
-	under the License. */ -->
-<configuration>
-	<property>
-		<name>hbase.cluster.distributed</name>
-		<value>true</value>
-	</property>
-	<property>
-		<name>hbase.master.dns.nameserver</name>
-		<value>133.133.134.188</value>
-		<description>The host name or IP address of the name server (DNS)
-			which a master should use to determine the host name used
-			forcommunication and display purposes.
-		</description>
-	</property>
-	<property>
-		<name>hbase.zookeeper.quorum</name>
-		<value>133.133.13.154</value>
-	</property>
-	<property>
-		<name>hbase.zookeeper.property.dataDir</name>
-		<value>/home/Xinsheng/hbase/tmp/zookeeper_data</value>
-	</property>
-	<property>
-		<name>hbase.master.info.bindAddress</name>
-		<value>133.133.134.188</value>
-		<description>The bind address for the HBase Master web UI
-		</description>
-	</property>
-</configuration>

Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/random/ui.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- <!DOCTYPE ui SYSTEM "../../dtd/ui.dtd"> -->
+<!DOCTYPE ui SYSTEM "../../dtd/ui.dtd">
 <ui>
 	<plugin name="Random">
 		<params>
-			<param name="begin" label="The Beginning of the range" required="true">
+			<param name="begin" label="The Beginning of the range"
+				required="true">
 				<field size="5"></field>
 			</param>
 			<param name="end" label="The end of the range" required="true">

Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/basic/timer/ui.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- <!DOCTYPE ui SYSTEM "../../dtd/ui.dtd"> -->
+<!DOCTYPE ui SYSTEM "../../dtd/ui.dtd">
 <ui>
 	<plugin name="ConstantTimer">
 		<params />

Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ScriptFilterOptionsModel.java

@@ -1,8 +1,5 @@
 package org.bench4q.share.models.agent;
 
-import java.util.List;
-
-
 public class ScriptFilterOptionsModel {
 	private boolean isFilterTimer = false;
 	private String filterTypeMatches;
@@ -23,5 +20,4 @@ public class ScriptFilterOptionsModel {
 		this.filterTypeMatches = filterTypeMatches;
 	}
 
-	
 }

Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ScriptModel.java

@@ -1,7 +1,6 @@
 package org.bench4q.share.models.master;
 
 import java.util.Date;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;