update script behavior

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

@@ -9,6 +9,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class BehaviorBriefModel {
 	private int behaviorId;
 	private String behaviorUrl;
+	private long totalCount;
+	private long successfulCount;
 	private List<BehaviorStatusCodeResultModel> detailStatusCodeResultModels;
 
 	@XmlElement
@@ -40,4 +42,22 @@ public class BehaviorBriefModel {
 		this.detailStatusCodeResultModels = detailStatusCodeResultModels;
 	}
 
+	@XmlElement
+	public long getTotalCount() {
+		return totalCount;
+	}
+
+	public void setTotalCount(long totalCount) {
+		this.totalCount = totalCount;
+	}
+
+	@XmlElement
+	public long getSuccessfulCount() {
+		return successfulCount;
+	}
+
+	public void setSuccessfulCount(long successfulCount) {
+		this.successfulCount = successfulCount;
+	}
+
 }

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

@@ -1,8 +1,8 @@
 package org.bench4q.share.models.master.plugin;
 
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.sun.xml.internal.txw2.annotation.XmlElement;
 
 @XmlRootElement
 public class ParamTypeModel {

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

@@ -1,32 +1,24 @@
 package org.bench4q.share.models.master.statistics;
 
+import java.util.List;
+
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
-
+import org.bench4q.share.models.agent.BehaviorBriefModel;
-import org.bench4q.share.models.agent.statistics.AgentBehaviorsBriefModel;
-
 @XmlRootElement(name = "scriptBehaviorsBriefModel")
 public class ScriptBehaviorsBriefModel extends SampleModel {
-	private boolean finished;
+	private List<BehaviorBriefModel> behaviorBriefModels;
-	private AgentBehaviorsBriefModel testBehaviorsBriefModel;
 
-	@XmlElement
+	@XmlElementWrapper(name = "behaviorBriefList")
-	public boolean isFinished() {
+	@XmlElement(name = "behaviorBrief")
-		return finished;
+	public List<BehaviorBriefModel> getBehaviorBriefModels() {
+		return behaviorBriefModels;
 	}
 
-	public void setFinished(boolean finished) {
+	public void setBehaviorBriefModels(
-		this.finished = finished;
+			List<BehaviorBriefModel> behaviorBriefModels) {
-	}
+		this.behaviorBriefModels = behaviorBriefModels;
-
-	@XmlElement
-	public AgentBehaviorsBriefModel getTestBehaviorsBriefModel() {
-		return testBehaviorsBriefModel;
-	}
-
-	public void setTestBehaviorsBriefModel(
-			AgentBehaviorsBriefModel testBehaviorsBriefModel) {
-		this.testBehaviorsBriefModel = testBehaviorsBriefModel;
 	}
 
 }

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

@@ -18,7 +18,6 @@ public class ScriptBriefResultModel extends SampleModel {
 	private long averageElapsedTime;
 	private long planedRunningTime;
 	private long vUserCount;
-	private boolean finished;
 
 	@XmlElement
 	public long getTotalSuccessCountFromBegin() {
@@ -120,14 +119,6 @@ public class ScriptBriefResultModel extends SampleModel {
 		this.planedRunningTime = planedRunningTime;
 	}
 
-	@XmlElement
-	public boolean isFinished() {
-		return finished;
-	}
-
-	public void setFinished(boolean finished) {
-		this.finished = finished;
-	}
 
 	@XmlElement
 	public long getvUserCount() {

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

@@ -5,7 +5,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 public class ScriptPageBriefModel extends SampleModel {
-	private boolean finished;
 	private long countFromBegin;
 	private long maxResponseTimeFromBegin;
 	private long minResponseTimeFromBegin;
@@ -14,15 +13,6 @@ public class ScriptPageBriefModel extends SampleModel {
 	private long throughputThisTime;
 	public long totalResponseTimeThisTime;
 
-	@XmlElement
-	public boolean isFinished() {
-		return finished;
-	}
-
-	public void setFinished(boolean finished) {
-		this.finished = finished;
-	}
-
 	@XmlElement
 	public long getCountFromBegin() {
 		return countFromBegin;

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

@@ -12,8 +12,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class ScriptPagesBriefModel extends SampleModel {
 	private List<ScriptPageBriefModel> scriptPageBriefModels;
 
-	@XmlElementWrapper
+	@XmlElementWrapper(name="pageBriefs")
-	@XmlElement
+	@XmlElement(name="pageBrief")
 	public List<ScriptPageBriefModel> getScriptPageBriefModels() {
 		return scriptPageBriefModels;
 	}

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

@@ -52,8 +52,8 @@ public class ScriptResultModel extends SampleModel {
 
 	private static ScriptPagesBriefModel buildFinishedPages() {
 		ScriptPagesBriefModel result = new ScriptPagesBriefModel();
-		result.setFinished(true);
 		result.setSamplingTime(new Date());
+		result.setFinished(true);
 		return result;
 	}