From bd7398ece2897a3df4ed117fd6d1f47080008d32 Mon Sep 17 00:00:00 2001 From: coderfengyun Date: Thu, 20 Mar 2014 11:32:53 +0800 Subject: [PATCH] Merge Bench4Q-Share --- pom.xml => Bench4Q-Share/pom.xml | 0 .../share/communication/HttpRequester.java | 0 .../share/enums/master/AgentStatus.java | 0 .../share/enums/master/TestPlanStatus.java | 0 .../bench4q/share/helper/MarshalHelper.java | 0 .../share/helper/RunScenarioModelHelper.java | 0 .../org/bench4q/share/helper/TestHelper.java | 0 .../share/models/ErrorResponseModel.java | 0 .../models/agent/BehaviorBriefModel.java | 0 .../share/models/agent/BehaviorInfoModel.java | 0 .../models/agent/BehaviorResultModel.java | 0 .../agent/BehaviorStatusCodeResultModel.java | 0 .../models/agent/CleanTestResultModel.java | 0 .../models/agent/ParameterInfoModel.java | 0 .../share/models/agent/ParameterModel.java | 0 .../models/agent/PluginInfoListModel.java | 0 .../share/models/agent/PluginInfoModel.java | 0 .../share/models/agent/RunScenarioModel.java | 104 +++--- .../models/agent/RunScenarioResultModel.java | 0 .../share/models/agent/ServerStatusModel.java | 0 .../models/agent/StatusCodeResultModel.java | 0 .../share/models/agent/StopTestModel.java | 0 .../models/agent/TestBriefStatusModel.java | 0 .../share/models/agent/TestDetailModel.java | 0 .../models/agent/TestDetailStatusModel.java | 0 .../models/agent/scriptrecord/BatchModel.java | 106 +++--- .../agent/scriptrecord/BehaviorModel.java | 186 ++++----- .../models/agent/scriptrecord/PageModel.java | 54 +-- .../agent/scriptrecord/UsePluginModel.java | 0 .../statistics/AgentBehaviorsBriefModel.java | 52 +-- .../statistics/AgentBriefStatusModel.java | 352 +++++++++--------- .../agent/statistics/AgentPageBriefModel.java | 178 ++++----- .../statistics/AgentPagesBriefModel.java | 48 +-- .../agent/statistics/DataStatisticsModel.java | 10 +- .../share/models/master/AgentModel.java | 0 .../models/master/AgentResponseModel.java | 0 .../models/master/AuthorizeResponseModel.java | 0 .../master/MonitorMemoryResponseModel.java | 86 ++--- .../share/models/master/MonitorModel.java | 0 .../master/MonitorNetworkReponseModel.java | 84 ++--- .../MonitorPhysicalDiskResponseModel.java | 86 ++--- .../master/MonitorProcessorResponseModel.java | 0 .../models/master/MonitorResultBase.java | 14 +- .../master/MonitorResultContainerModel.java | 110 +++--- .../OperateScriptServerResponseModel.java | 0 .../OrganizeRecordPortResponseModel.java | 0 .../share/models/master/PortModel.java | 0 .../models/master/ProcessResponseModel.java | 74 ++-- .../models/master/RegisterResponseModel.java | 0 .../share/models/master/ResultLoadModel.java | 54 +-- .../models/master/RunningAgentModel.java | 0 .../models/master/RunningScriptModel.java | 190 +++++----- .../share/models/master/ScriptModel.java | 0 .../models/master/ServerStatusModel.java | 0 .../TestPlanBehaviorsBriefResultModel.java | 52 +-- .../share/models/master/TestPlanDBModel.java | 0 .../share/models/master/TestPlanModel.java | 0 .../models/master/TestPlanResponseModel.java | 0 .../models/master/TestPlanResultModel.java | 0 .../TestPlanScriptBriefResultModel.java | 52 +-- .../share/models/master/TestScriptConfig.java | 0 .../share/models/master/UserModel.java | 0 .../share/models/master/ValueTimeModel.java | 74 ++-- .../models/master/plugin/MethodModel.java | 70 ++-- .../master/plugin/MethodParamModel.java | 138 +++---- .../plugin/MethodParamPropertyModel.java | 60 +-- .../models/master/plugin/ParamTypeEnum.java | 12 +- .../share/models/master/plugin/PluginGUI.java | 40 +- .../models/master/plugin/PluginModel.java | 66 ++-- .../master/plugin/PluginResponseModel.java | 132 +++---- .../models/master/statistics/SampleModel.java | 42 +-- .../statistics/ScriptBehaviorsBriefModel.java | 64 ++-- .../statistics/ScriptBriefResultModel.java | 0 .../statistics/ScriptPageBriefModel.java | 174 ++++----- .../statistics/ScriptPagesBriefModel.java | 60 +-- .../share/models/monitor/FileSystemModel.java | 0 .../share/models/monitor/MemoryModel.java | 0 .../share/models/monitor/MonitorMain.java | 0 .../models/monitor/NetworkInterfaceModel.java | 0 .../models/monitor/PhysicalDiskModel.java | 0 .../share/models/monitor/ProcessModel.java | 0 .../models/monitor/ProcessModelChild.java | 0 .../share/models/monitor/ProcessorModel.java | 0 .../models/monitor/ProcessorModelChild.java | 0 .../org/bench4q/bench4q_share/AppTest.java | 0 85 files changed, 1412 insertions(+), 1412 deletions(-) rename pom.xml => Bench4Q-Share/pom.xml (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/communication/HttpRequester.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/enums/master/AgentStatus.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/enums/master/TestPlanStatus.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/helper/MarshalHelper.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/helper/RunScenarioModelHelper.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/helper/TestHelper.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/ErrorResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/BehaviorBriefModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/BehaviorInfoModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/BehaviorResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/BehaviorStatusCodeResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/CleanTestResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/ParameterInfoModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/ParameterModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/PluginInfoListModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/PluginInfoModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/RunScenarioModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/RunScenarioResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/ServerStatusModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/StatusCodeResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/StopTestModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/TestBriefStatusModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/TestDetailModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/TestDetailStatusModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java (94%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/scriptrecord/UsePluginModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/AgentModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/AgentResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/AuthorizeResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorProcessorResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorResultBase.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/OrganizeRecordPortResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/PortModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/ProcessResponseModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/RegisterResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/ResultLoadModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/RunningAgentModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/RunningScriptModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/ScriptModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/ServerStatusModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestPlanDBModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestPlanModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestPlanResponseModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestPlanResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/TestScriptConfig.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/UserModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/ValueTimeModel.java (94%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/MethodModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java (94%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/PluginModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/statistics/SampleModel.java (95%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/statistics/ScriptBriefResultModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java (96%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/FileSystemModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/MemoryModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/MonitorMain.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/NetworkInterfaceModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/PhysicalDiskModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/ProcessModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/ProcessModelChild.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/ProcessorModel.java (100%) rename {src => Bench4Q-Share/src}/main/java/org/bench4q/share/models/monitor/ProcessorModelChild.java (100%) rename {src => Bench4Q-Share/src}/test/java/org/bench4q/bench4q_share/AppTest.java (100%) diff --git a/pom.xml b/Bench4Q-Share/pom.xml similarity index 100% rename from pom.xml rename to Bench4Q-Share/pom.xml diff --git a/src/main/java/org/bench4q/share/communication/HttpRequester.java b/Bench4Q-Share/src/main/java/org/bench4q/share/communication/HttpRequester.java similarity index 100% rename from src/main/java/org/bench4q/share/communication/HttpRequester.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/communication/HttpRequester.java diff --git a/src/main/java/org/bench4q/share/enums/master/AgentStatus.java b/Bench4Q-Share/src/main/java/org/bench4q/share/enums/master/AgentStatus.java similarity index 100% rename from src/main/java/org/bench4q/share/enums/master/AgentStatus.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/enums/master/AgentStatus.java diff --git a/src/main/java/org/bench4q/share/enums/master/TestPlanStatus.java b/Bench4Q-Share/src/main/java/org/bench4q/share/enums/master/TestPlanStatus.java similarity index 100% rename from src/main/java/org/bench4q/share/enums/master/TestPlanStatus.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/enums/master/TestPlanStatus.java diff --git a/src/main/java/org/bench4q/share/helper/MarshalHelper.java b/Bench4Q-Share/src/main/java/org/bench4q/share/helper/MarshalHelper.java similarity index 100% rename from src/main/java/org/bench4q/share/helper/MarshalHelper.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/helper/MarshalHelper.java diff --git a/src/main/java/org/bench4q/share/helper/RunScenarioModelHelper.java b/Bench4Q-Share/src/main/java/org/bench4q/share/helper/RunScenarioModelHelper.java similarity index 100% rename from src/main/java/org/bench4q/share/helper/RunScenarioModelHelper.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/helper/RunScenarioModelHelper.java diff --git a/src/main/java/org/bench4q/share/helper/TestHelper.java b/Bench4Q-Share/src/main/java/org/bench4q/share/helper/TestHelper.java similarity index 100% rename from src/main/java/org/bench4q/share/helper/TestHelper.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/helper/TestHelper.java diff --git a/src/main/java/org/bench4q/share/models/ErrorResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/ErrorResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/ErrorResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/ErrorResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/BehaviorBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorBriefModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/BehaviorBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorBriefModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/BehaviorInfoModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorInfoModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/BehaviorInfoModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorInfoModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/BehaviorResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/BehaviorResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorResultModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/BehaviorStatusCodeResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorStatusCodeResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/BehaviorStatusCodeResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/BehaviorStatusCodeResultModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/CleanTestResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/CleanTestResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/CleanTestResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/CleanTestResultModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/ParameterInfoModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ParameterInfoModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/ParameterInfoModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ParameterInfoModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/ParameterModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ParameterModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/ParameterModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ParameterModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/PluginInfoListModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/PluginInfoListModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/PluginInfoListModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/PluginInfoListModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/PluginInfoModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/PluginInfoModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/PluginInfoModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/PluginInfoModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java index 13233407..6e4bc41c 100644 --- a/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioModel.java @@ -1,52 +1,52 @@ -package org.bench4q.share.models.agent; - -import java.util.ArrayList; -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.scriptrecord.PageModel; -import org.bench4q.share.models.agent.scriptrecord.UsePluginModel; - -@XmlRootElement(name = "runScenario") -public class RunScenarioModel { - private int poolSize; - private List usePlugins; - private List pages; - - @XmlElement - public int getPoolSize() { - return poolSize; - } - - public void setPoolSize(int poolSize) { - this.poolSize = poolSize; - } - - @XmlElementWrapper(name = "usePlugins") - @XmlElement(name = "usePlugin") - public List getUsePlugins() { - return usePlugins; - } - - public void setUsePlugins(List usePlugins) { - this.usePlugins = usePlugins; - } - - @XmlElementWrapper(name = "pages") - @XmlElement(name = "page") - public List getPages() { - return pages; - } - - public void setPages(List pages) { - this.pages = pages; - } - - public RunScenarioModel() { - this.setUsePlugins(new ArrayList()); - this.setPages(new ArrayList()); - } -} +package org.bench4q.share.models.agent; + +import java.util.ArrayList; +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.scriptrecord.PageModel; +import org.bench4q.share.models.agent.scriptrecord.UsePluginModel; + +@XmlRootElement(name = "runScenario") +public class RunScenarioModel { + private int poolSize; + private List usePlugins; + private List pages; + + @XmlElement + public int getPoolSize() { + return poolSize; + } + + public void setPoolSize(int poolSize) { + this.poolSize = poolSize; + } + + @XmlElementWrapper(name = "usePlugins") + @XmlElement(name = "usePlugin") + public List getUsePlugins() { + return usePlugins; + } + + public void setUsePlugins(List usePlugins) { + this.usePlugins = usePlugins; + } + + @XmlElementWrapper(name = "pages") + @XmlElement(name = "page") + public List getPages() { + return pages; + } + + public void setPages(List pages) { + this.pages = pages; + } + + public RunScenarioModel() { + this.setUsePlugins(new ArrayList()); + this.setPages(new ArrayList()); + } +} diff --git a/src/main/java/org/bench4q/share/models/agent/RunScenarioResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/RunScenarioResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/RunScenarioResultModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/ServerStatusModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ServerStatusModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/ServerStatusModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/ServerStatusModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/StatusCodeResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/StatusCodeResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/StatusCodeResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/StatusCodeResultModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/StopTestModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/StopTestModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/StopTestModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/StopTestModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/TestBriefStatusModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/TestBriefStatusModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/TestBriefStatusModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/TestBriefStatusModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/TestDetailModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/TestDetailModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/TestDetailModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/TestDetailModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/TestDetailStatusModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/TestDetailStatusModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/TestDetailStatusModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/TestDetailStatusModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java similarity index 94% rename from src/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java index 3cbec463..b1f45153 100644 --- a/src/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/BatchModel.java @@ -1,53 +1,53 @@ -package org.bench4q.share.models.agent.scriptrecord; - -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "batch") -public class BatchModel { - private int Id; - private int parentId; - private int childId; - private List behaviors; - - @XmlElement - public int getId() { - return Id; - } - - public void setId(int id) { - Id = id; - } - - @XmlElement - public int getParentId() { - return parentId; - } - - public void setParentId(int parentBatchId) { - this.parentId = parentBatchId; - } - - @XmlElement - public int getChildId() { - return childId; - } - - public void setChildId(int childId) { - this.childId = childId; - } - - @XmlElementWrapper(name = "behaviors") - @XmlElement(name = "behaviorModel") - public List getBehaviors() { - return behaviors; - } - - public void setBehaviors(List behaviors) { - this.behaviors = behaviors; - } - -} +package org.bench4q.share.models.agent.scriptrecord; + +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "batch") +public class BatchModel { + private int Id; + private int parentId; + private int childId; + private List behaviors; + + @XmlElement + public int getId() { + return Id; + } + + public void setId(int id) { + Id = id; + } + + @XmlElement + public int getParentId() { + return parentId; + } + + public void setParentId(int parentBatchId) { + this.parentId = parentBatchId; + } + + @XmlElement + public int getChildId() { + return childId; + } + + public void setChildId(int childId) { + this.childId = childId; + } + + @XmlElementWrapper(name = "behaviors") + @XmlElement(name = "behaviorModel") + public List getBehaviors() { + return behaviors; + } + + public void setBehaviors(List behaviors) { + this.behaviors = behaviors; + } + +} diff --git a/src/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java index e8a21e08..ac9d4aa6 100644 --- a/src/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/BehaviorModel.java @@ -1,93 +1,93 @@ -package org.bench4q.share.models.agent.scriptrecord; - -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.ParameterModel; - -@XmlRootElement(name = "behaviorModel") -public class BehaviorModel { - private int id; - private String use; - private String name; - private String type; - private List parameters; - - @XmlElement - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - @XmlElement - public String getUse() { - return use; - } - - public void setUse(String use) { - this.use = use; - } - - @XmlElement - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @XmlElement - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - @XmlElementWrapper(name = "parameters") - @XmlElement(name = "parameter") - public List getParameters() { - return parameters; - } - - public void setParameters(List parameters) { - this.parameters = parameters; - } - - private BehaviorModel() { - } - - public static BehaviorModel TimerBehaviorBuilder(int id, String name, - String use, List parameters) { - BehaviorModel behaviorBaseModel = buildBehaviorModelWithoutType(id, - name, use, parameters); - behaviorBaseModel.setType("TIMERBEHAVIOR"); - return behaviorBaseModel; - } - - private static BehaviorModel buildBehaviorModelWithoutType(int id, - String name, String use, List parameters) { - BehaviorModel behaviorBaseModel = new BehaviorModel(); - behaviorBaseModel.setId(id); - behaviorBaseModel.setName(name); - behaviorBaseModel.setUse(use); - behaviorBaseModel.setParameters(parameters); - return behaviorBaseModel; - } - - public static BehaviorModel UserBehaviorBuilder(int id, String name, - String use, List parameters) { - BehaviorModel behaviorBaseModel = buildBehaviorModelWithoutType(id, - name, use, parameters); - behaviorBaseModel.setType("USERBEHAVIOR"); - return behaviorBaseModel; - } -} +package org.bench4q.share.models.agent.scriptrecord; + +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.ParameterModel; + +@XmlRootElement(name = "behaviorModel") +public class BehaviorModel { + private int id; + private String use; + private String name; + private String type; + private List parameters; + + @XmlElement + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + @XmlElement + public String getUse() { + return use; + } + + public void setUse(String use) { + this.use = use; + } + + @XmlElement + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @XmlElement + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @XmlElementWrapper(name = "parameters") + @XmlElement(name = "parameter") + public List getParameters() { + return parameters; + } + + public void setParameters(List parameters) { + this.parameters = parameters; + } + + private BehaviorModel() { + } + + public static BehaviorModel TimerBehaviorBuilder(int id, String name, + String use, List parameters) { + BehaviorModel behaviorBaseModel = buildBehaviorModelWithoutType(id, + name, use, parameters); + behaviorBaseModel.setType("TIMERBEHAVIOR"); + return behaviorBaseModel; + } + + private static BehaviorModel buildBehaviorModelWithoutType(int id, + String name, String use, List parameters) { + BehaviorModel behaviorBaseModel = new BehaviorModel(); + behaviorBaseModel.setId(id); + behaviorBaseModel.setName(name); + behaviorBaseModel.setUse(use); + behaviorBaseModel.setParameters(parameters); + return behaviorBaseModel; + } + + public static BehaviorModel UserBehaviorBuilder(int id, String name, + String use, List parameters) { + BehaviorModel behaviorBaseModel = buildBehaviorModelWithoutType(id, + name, use, parameters); + behaviorBaseModel.setType("USERBEHAVIOR"); + return behaviorBaseModel; + } +} diff --git a/src/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java index 90d11c09..2265e27a 100644 --- a/src/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/PageModel.java @@ -1,27 +1,27 @@ -package org.bench4q.share.models.agent.scriptrecord; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "page") -public class PageModel { - private List batches; - - @XmlElementWrapper(name = "batches") - @XmlElement(name = "batch") - public List getBatches() { - return batches; - } - - public void setBatches(List batches) { - this.batches = batches; - } - - public PageModel() { - this.setBatches(new ArrayList()); - } -} +package org.bench4q.share.models.agent.scriptrecord; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "page") +public class PageModel { + private List batches; + + @XmlElementWrapper(name = "batches") + @XmlElement(name = "batch") + public List getBatches() { + return batches; + } + + public void setBatches(List batches) { + this.batches = batches; + } + + public PageModel() { + this.setBatches(new ArrayList()); + } +} diff --git a/src/main/java/org/bench4q/share/models/agent/scriptrecord/UsePluginModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/UsePluginModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/agent/scriptrecord/UsePluginModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/scriptrecord/UsePluginModel.java diff --git a/src/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java index 1f7feca2..9c385f1b 100644 --- a/src/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentBehaviorsBriefModel.java @@ -1,26 +1,26 @@ -package org.bench4q.share.models.agent.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; - -@XmlRootElement(name = "testBehaviorBriefModel") -public class AgentBehaviorsBriefModel extends DataStatisticsModel { - private List behaviorBriefModels; - - @XmlElementWrapper(name = "behaviorBriefList") - @XmlElement(name = "behaviorBrief") - public List getBehaviorBriefModels() { - return behaviorBriefModels; - } - - public void setBehaviorBriefModels( - List behaviorBriefModels) { - this.behaviorBriefModels = behaviorBriefModels; - } - -} +package org.bench4q.share.models.agent.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; + +@XmlRootElement(name = "testBehaviorBriefModel") +public class AgentBehaviorsBriefModel extends DataStatisticsModel { + private List behaviorBriefModels; + + @XmlElementWrapper(name = "behaviorBriefList") + @XmlElement(name = "behaviorBrief") + public List getBehaviorBriefModels() { + return behaviorBriefModels; + } + + public void setBehaviorBriefModels( + List behaviorBriefModels) { + this.behaviorBriefModels = behaviorBriefModels; + } + +} diff --git a/src/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java index 2fdaddca..1699836a 100644 --- a/src/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentBriefStatusModel.java @@ -1,176 +1,176 @@ -package org.bench4q.share.models.agent.statistics; - -import java.io.ByteArrayInputStream; -import java.lang.reflect.Field; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class AgentBriefStatusModel extends DataStatisticsModel { - private long timeFrame; - private long minResponseTime; - private long maxResponseTime; - private long successCountFromBegin; - private long successThroughputThisTime; - private long failCountFromBegin; - private long failThroughputThisTime; - private long successCountThisTime; - private long failCountThisTime; - private long totalResponseTimeThisTime; - private long totalSqureResponseTimeThisTime; - - private long vUserCount; - - @XmlElement - public long getTimeFrame() { - return timeFrame; - } - - public void setTimeFrame(long timeFrame) { - this.timeFrame = timeFrame; - } - - @XmlElement - public long getMinResponseTime() { - return minResponseTime; - } - - public void setMinResponseTime(long minResponseTime) { - this.minResponseTime = minResponseTime; - } - - @XmlElement - public long getMaxResponseTime() { - return maxResponseTime; - } - - public void setMaxResponseTime(long maxResponseTime) { - this.maxResponseTime = maxResponseTime; - } - - @XmlElement - public long getSuccessThroughputThisTime() { - return successThroughputThisTime; - } - - public void setSuccessThroughputThisTime(long successThroughputThisTime) { - this.successThroughputThisTime = successThroughputThisTime; - } - - @XmlElement - public long getSuccessCountFromBegin() { - return successCountFromBegin; - } - - public void setSuccessCountFromBegin(long successCountFromBegin) { - this.successCountFromBegin = successCountFromBegin; - } - - @XmlElement - public long getFailCountFromBegin() { - return failCountFromBegin; - } - - public void setFailCountFromBegin(long failCountFromBegin) { - this.failCountFromBegin = failCountFromBegin; - } - - @XmlElement - public long getFailThroughputThisTime() { - return failThroughputThisTime; - } - - public void setFailThroughputThisTime(long failThroughputThisTime) { - this.failThroughputThisTime = failThroughputThisTime; - } - - @XmlElement - public long getSuccessCountThisTime() { - return successCountThisTime; - } - - public void setSuccessCountThisTime(long successCountThisTime) { - this.successCountThisTime = successCountThisTime; - } - - @XmlElement - public long getFailCountThisTime() { - return failCountThisTime; - } - - public void setFailCountThisTime(long failCountThisTime) { - this.failCountThisTime = failCountThisTime; - } - - @XmlElement - public long getTotalResponseTimeThisTime() { - return totalResponseTimeThisTime; - } - - public void setTotalResponseTimeThisTime(long totalResponseTimeThisTime) { - this.totalResponseTimeThisTime = totalResponseTimeThisTime; - } - - @XmlElement - public long getTotalSqureResponseTimeThisTime() { - return totalSqureResponseTimeThisTime; - } - - public void setTotalSqureResponseTimeThisTime( - long totalSqureResponseTimeThisTime) { - this.totalSqureResponseTimeThisTime = totalSqureResponseTimeThisTime; - } - - @XmlElement - public long getvUserCount() { - return vUserCount; - } - - public void setvUserCount(long vUserCount) { - this.vUserCount = vUserCount; - } - - // if the all the fields of target object equals with this's except - // timeFrame, - // We call it equals. - @Override - public boolean equals(Object targetObj) { - if (!(targetObj instanceof AgentBriefStatusModel) || targetObj == null) { - return false; - } - boolean result = true; - AgentBriefStatusModel convertedObject = (AgentBriefStatusModel) targetObj; - Field[] fs = this.getClass().getDeclaredFields(); - try { - for (Field field : fs) { - if (field.getName().equals("vUserCount")) { - continue; - } - field.setAccessible(true); - if (field.getLong(this) != field.getLong(convertedObject)) { - System.out.println(field.getName() - + " not equals! and the target is " - + field.getLong(convertedObject) + " and this is " - + field.getLong(this)); - result = false; - } - } - } catch (Exception e) { - e.printStackTrace(); - result = false; - } - return result; - } - - public static AgentBriefStatusModel extractBriefStatusModel(String content) - throws JAXBException { - Unmarshaller unmarshaller = JAXBContext.newInstance( - AgentBriefStatusModel.class).createUnmarshaller(); - return (AgentBriefStatusModel) unmarshaller - .unmarshal(new ByteArrayInputStream(content.getBytes())); - } -} +package org.bench4q.share.models.agent.statistics; + +import java.io.ByteArrayInputStream; +import java.lang.reflect.Field; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class AgentBriefStatusModel extends DataStatisticsModel { + private long timeFrame; + private long minResponseTime; + private long maxResponseTime; + private long successCountFromBegin; + private long successThroughputThisTime; + private long failCountFromBegin; + private long failThroughputThisTime; + private long successCountThisTime; + private long failCountThisTime; + private long totalResponseTimeThisTime; + private long totalSqureResponseTimeThisTime; + + private long vUserCount; + + @XmlElement + public long getTimeFrame() { + return timeFrame; + } + + public void setTimeFrame(long timeFrame) { + this.timeFrame = timeFrame; + } + + @XmlElement + public long getMinResponseTime() { + return minResponseTime; + } + + public void setMinResponseTime(long minResponseTime) { + this.minResponseTime = minResponseTime; + } + + @XmlElement + public long getMaxResponseTime() { + return maxResponseTime; + } + + public void setMaxResponseTime(long maxResponseTime) { + this.maxResponseTime = maxResponseTime; + } + + @XmlElement + public long getSuccessThroughputThisTime() { + return successThroughputThisTime; + } + + public void setSuccessThroughputThisTime(long successThroughputThisTime) { + this.successThroughputThisTime = successThroughputThisTime; + } + + @XmlElement + public long getSuccessCountFromBegin() { + return successCountFromBegin; + } + + public void setSuccessCountFromBegin(long successCountFromBegin) { + this.successCountFromBegin = successCountFromBegin; + } + + @XmlElement + public long getFailCountFromBegin() { + return failCountFromBegin; + } + + public void setFailCountFromBegin(long failCountFromBegin) { + this.failCountFromBegin = failCountFromBegin; + } + + @XmlElement + public long getFailThroughputThisTime() { + return failThroughputThisTime; + } + + public void setFailThroughputThisTime(long failThroughputThisTime) { + this.failThroughputThisTime = failThroughputThisTime; + } + + @XmlElement + public long getSuccessCountThisTime() { + return successCountThisTime; + } + + public void setSuccessCountThisTime(long successCountThisTime) { + this.successCountThisTime = successCountThisTime; + } + + @XmlElement + public long getFailCountThisTime() { + return failCountThisTime; + } + + public void setFailCountThisTime(long failCountThisTime) { + this.failCountThisTime = failCountThisTime; + } + + @XmlElement + public long getTotalResponseTimeThisTime() { + return totalResponseTimeThisTime; + } + + public void setTotalResponseTimeThisTime(long totalResponseTimeThisTime) { + this.totalResponseTimeThisTime = totalResponseTimeThisTime; + } + + @XmlElement + public long getTotalSqureResponseTimeThisTime() { + return totalSqureResponseTimeThisTime; + } + + public void setTotalSqureResponseTimeThisTime( + long totalSqureResponseTimeThisTime) { + this.totalSqureResponseTimeThisTime = totalSqureResponseTimeThisTime; + } + + @XmlElement + public long getvUserCount() { + return vUserCount; + } + + public void setvUserCount(long vUserCount) { + this.vUserCount = vUserCount; + } + + // if the all the fields of target object equals with this's except + // timeFrame, + // We call it equals. + @Override + public boolean equals(Object targetObj) { + if (!(targetObj instanceof AgentBriefStatusModel) || targetObj == null) { + return false; + } + boolean result = true; + AgentBriefStatusModel convertedObject = (AgentBriefStatusModel) targetObj; + Field[] fs = this.getClass().getDeclaredFields(); + try { + for (Field field : fs) { + if (field.getName().equals("vUserCount")) { + continue; + } + field.setAccessible(true); + if (field.getLong(this) != field.getLong(convertedObject)) { + System.out.println(field.getName() + + " not equals! and the target is " + + field.getLong(convertedObject) + " and this is " + + field.getLong(this)); + result = false; + } + } + } catch (Exception e) { + e.printStackTrace(); + result = false; + } + return result; + } + + public static AgentBriefStatusModel extractBriefStatusModel(String content) + throws JAXBException { + Unmarshaller unmarshaller = JAXBContext.newInstance( + AgentBriefStatusModel.class).createUnmarshaller(); + return (AgentBriefStatusModel) unmarshaller + .unmarshal(new ByteArrayInputStream(content.getBytes())); + } +} diff --git a/src/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java index bfb24fae..9acb1261 100644 --- a/src/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentPageBriefModel.java @@ -1,89 +1,89 @@ -package org.bench4q.share.models.agent.statistics; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class AgentPageBriefModel extends DataStatisticsModel { - private int pageId; - private long timeFrame; - private long countThisTime; - private long totalResponseTimeThisTime; - private long maxResponseTimeFromBegin; - private long minResponseTimeFromBegin; - private long countFromBegin; - private long latestResponseTime; - - @XmlElement - public int getPageId() { - return pageId; - } - - public void setPageId(int pageId) { - this.pageId = pageId; - } - - @XmlElement - public long getTimeFrame() { - return timeFrame; - } - - public void setTimeFrame(long timeFrame) { - this.timeFrame = timeFrame; - } - - @XmlElement - public long getCountThisTime() { - return countThisTime; - } - - public void setCountThisTime(long countThisTime) { - this.countThisTime = countThisTime; - } - - @XmlElement - public long getTotalResponseTimeThisTime() { - return totalResponseTimeThisTime; - } - - public void setTotalResponseTimeThisTime(long totalResponseTimeThisTime) { - this.totalResponseTimeThisTime = totalResponseTimeThisTime; - } - - @XmlElement - public long getMaxResponseTimeFromBegin() { - return maxResponseTimeFromBegin; - } - - public void setMaxResponseTimeFromBegin(long maxResponseTimeFromBegin) { - this.maxResponseTimeFromBegin = maxResponseTimeFromBegin; - } - - @XmlElement - public long getMinResponseTimeFromBegin() { - return minResponseTimeFromBegin; - } - - public void setMinResponseTimeFromBegin(long minResponseTimeFromBegin) { - this.minResponseTimeFromBegin = minResponseTimeFromBegin; - } - - @XmlElement - public long getCountFromBegin() { - return countFromBegin; - } - - public void setCountFromBegin(long countFromBegin) { - this.countFromBegin = countFromBegin; - } - - @XmlElement - public long getLatestResponseTime() { - return latestResponseTime; - } - - public void setLatestResponseTime(long latestTimeResponseTime) { - this.latestResponseTime = latestTimeResponseTime; - } - -} +package org.bench4q.share.models.agent.statistics; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class AgentPageBriefModel extends DataStatisticsModel { + private int pageId; + private long timeFrame; + private long countThisTime; + private long totalResponseTimeThisTime; + private long maxResponseTimeFromBegin; + private long minResponseTimeFromBegin; + private long countFromBegin; + private long latestResponseTime; + + @XmlElement + public int getPageId() { + return pageId; + } + + public void setPageId(int pageId) { + this.pageId = pageId; + } + + @XmlElement + public long getTimeFrame() { + return timeFrame; + } + + public void setTimeFrame(long timeFrame) { + this.timeFrame = timeFrame; + } + + @XmlElement + public long getCountThisTime() { + return countThisTime; + } + + public void setCountThisTime(long countThisTime) { + this.countThisTime = countThisTime; + } + + @XmlElement + public long getTotalResponseTimeThisTime() { + return totalResponseTimeThisTime; + } + + public void setTotalResponseTimeThisTime(long totalResponseTimeThisTime) { + this.totalResponseTimeThisTime = totalResponseTimeThisTime; + } + + @XmlElement + public long getMaxResponseTimeFromBegin() { + return maxResponseTimeFromBegin; + } + + public void setMaxResponseTimeFromBegin(long maxResponseTimeFromBegin) { + this.maxResponseTimeFromBegin = maxResponseTimeFromBegin; + } + + @XmlElement + public long getMinResponseTimeFromBegin() { + return minResponseTimeFromBegin; + } + + public void setMinResponseTimeFromBegin(long minResponseTimeFromBegin) { + this.minResponseTimeFromBegin = minResponseTimeFromBegin; + } + + @XmlElement + public long getCountFromBegin() { + return countFromBegin; + } + + public void setCountFromBegin(long countFromBegin) { + this.countFromBegin = countFromBegin; + } + + @XmlElement + public long getLatestResponseTime() { + return latestResponseTime; + } + + public void setLatestResponseTime(long latestTimeResponseTime) { + this.latestResponseTime = latestTimeResponseTime; + } + +} diff --git a/src/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java index a2f422aa..0dc2dd6c 100644 --- a/src/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/AgentPagesBriefModel.java @@ -1,24 +1,24 @@ -package org.bench4q.share.models.agent.statistics; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class AgentPagesBriefModel extends DataStatisticsModel { - private List pageBriefModels = new ArrayList(); - - @XmlElementWrapper - @XmlElement(name = "singlePage") - public List getPageBriefModels() { - return pageBriefModels; - } - - public void setPageBriefModels(List pageBriefModels) { - this.pageBriefModels = pageBriefModels; - } - -} +package org.bench4q.share.models.agent.statistics; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class AgentPagesBriefModel extends DataStatisticsModel { + private List pageBriefModels = new ArrayList(); + + @XmlElementWrapper + @XmlElement(name = "singlePage") + public List getPageBriefModels() { + return pageBriefModels; + } + + public void setPageBriefModels(List pageBriefModels) { + this.pageBriefModels = pageBriefModels; + } + +} diff --git a/src/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java index 2846fc34..f3ffdf53 100644 --- a/src/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/agent/statistics/DataStatisticsModel.java @@ -1,5 +1,5 @@ -package org.bench4q.share.models.agent.statistics; - -public abstract class DataStatisticsModel { - -} +package org.bench4q.share.models.agent.statistics; + +public abstract class DataStatisticsModel { + +} diff --git a/src/main/java/org/bench4q/share/models/master/AgentModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/AgentModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/AgentModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/AgentModel.java diff --git a/src/main/java/org/bench4q/share/models/master/AgentResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/AgentResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/AgentResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/AgentResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/AuthorizeResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/AuthorizeResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/AuthorizeResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/AuthorizeResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java index 01f77440..7ed22cc7 100644 --- a/src/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorMemoryResponseModel.java @@ -1,43 +1,43 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -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.master.statistics.SampleModel; -import org.bench4q.share.models.monitor.MemoryModel; - -/** - * When asked for memory, this will be response - * - * @author coderfengyun - * - */ -@XmlRootElement(name = "MonitorMemoryResponseModel") -public class MonitorMemoryResponseModel implements MonitorResultBase { - private List memoryModels; - - @XmlElementWrapper - @XmlElement(name = "memoryModel") - public List getMemoryModels() { - return memoryModels; - } - - public void setMemoryModels(List memoryModels) { - this.memoryModels = memoryModels; - } - - public MonitorMemoryResponseModel() { - this.setMemoryModels(new ArrayList()); - } - - public void add(SampleModel model) { - if (model instanceof MemoryModel) { - this.getMemoryModels().add((MemoryModel) model); - } - } - -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +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.master.statistics.SampleModel; +import org.bench4q.share.models.monitor.MemoryModel; + +/** + * When asked for memory, this will be response + * + * @author coderfengyun + * + */ +@XmlRootElement(name = "MonitorMemoryResponseModel") +public class MonitorMemoryResponseModel implements MonitorResultBase { + private List memoryModels; + + @XmlElementWrapper + @XmlElement(name = "memoryModel") + public List getMemoryModels() { + return memoryModels; + } + + public void setMemoryModels(List memoryModels) { + this.memoryModels = memoryModels; + } + + public MonitorMemoryResponseModel() { + this.setMemoryModels(new ArrayList()); + } + + public void add(SampleModel model) { + if (model instanceof MemoryModel) { + this.getMemoryModels().add((MemoryModel) model); + } + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/MonitorModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/MonitorModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorModel.java diff --git a/src/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java index a9e1c77a..a96de930 100644 --- a/src/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorNetworkReponseModel.java @@ -1,42 +1,42 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -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.master.statistics.SampleModel; -import org.bench4q.share.models.monitor.NetworkInterfaceModel; - -/** - * When asked for network, this will be response - * - * @author coderfengyun - * - */ -@XmlRootElement -public class MonitorNetworkReponseModel implements MonitorResultBase { - private List models; - - @XmlElementWrapper - @XmlElement(name = "networkInterface") - public List getModels() { - return models; - } - - public void setModels(List models) { - this.models = models; - } - - public MonitorNetworkReponseModel() { - this.setModels(new ArrayList()); - } - - public void add(SampleModel model) { - if (model instanceof NetworkInterfaceModel) { - this.getModels().add((NetworkInterfaceModel) model); - } - } -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +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.master.statistics.SampleModel; +import org.bench4q.share.models.monitor.NetworkInterfaceModel; + +/** + * When asked for network, this will be response + * + * @author coderfengyun + * + */ +@XmlRootElement +public class MonitorNetworkReponseModel implements MonitorResultBase { + private List models; + + @XmlElementWrapper + @XmlElement(name = "networkInterface") + public List getModels() { + return models; + } + + public void setModels(List models) { + this.models = models; + } + + public MonitorNetworkReponseModel() { + this.setModels(new ArrayList()); + } + + public void add(SampleModel model) { + if (model instanceof NetworkInterfaceModel) { + this.getModels().add((NetworkInterfaceModel) model); + } + } +} diff --git a/src/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java index fb55a6a2..f96eefab 100644 --- a/src/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorPhysicalDiskResponseModel.java @@ -1,43 +1,43 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -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.master.statistics.SampleModel; -import org.bench4q.share.models.monitor.PhysicalDiskModel; - -/** - * When asked for logicalDisk, this model will be response - * - * @author coderfengyun - * - */ -@XmlRootElement(name = "MonitorPhysicDisk") -public class MonitorPhysicalDiskResponseModel implements MonitorResultBase { - private List physicalDiskModels; - - public MonitorPhysicalDiskResponseModel() { - this.setPhysicalDiskModels(new ArrayList()); - } - - @XmlElementWrapper - @XmlElement(name = "physicDisk") - public List getPhysicalDiskModels() { - return physicalDiskModels; - } - - public void setPhysicalDiskModels(List physicalDiskModels) { - this.physicalDiskModels = physicalDiskModels; - } - - public void add(SampleModel model) { - if (model instanceof PhysicalDiskModel) { - this.getPhysicalDiskModels().add((PhysicalDiskModel) model); - } - } - -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +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.master.statistics.SampleModel; +import org.bench4q.share.models.monitor.PhysicalDiskModel; + +/** + * When asked for logicalDisk, this model will be response + * + * @author coderfengyun + * + */ +@XmlRootElement(name = "MonitorPhysicDisk") +public class MonitorPhysicalDiskResponseModel implements MonitorResultBase { + private List physicalDiskModels; + + public MonitorPhysicalDiskResponseModel() { + this.setPhysicalDiskModels(new ArrayList()); + } + + @XmlElementWrapper + @XmlElement(name = "physicDisk") + public List getPhysicalDiskModels() { + return physicalDiskModels; + } + + public void setPhysicalDiskModels(List physicalDiskModels) { + this.physicalDiskModels = physicalDiskModels; + } + + public void add(SampleModel model) { + if (model instanceof PhysicalDiskModel) { + this.getPhysicalDiskModels().add((PhysicalDiskModel) model); + } + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/MonitorProcessorResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorProcessorResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/MonitorProcessorResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorProcessorResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/MonitorResultBase.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorResultBase.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/MonitorResultBase.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorResultBase.java index c2e05a38..fce8a15a 100644 --- a/src/main/java/org/bench4q/share/models/master/MonitorResultBase.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorResultBase.java @@ -1,7 +1,7 @@ -package org.bench4q.share.models.master; - -import org.bench4q.share.models.master.statistics.SampleModel; - -public interface MonitorResultBase { - public void add(SampleModel model); -} +package org.bench4q.share.models.master; + +import org.bench4q.share.models.master.statistics.SampleModel; + +public interface MonitorResultBase { + public void add(SampleModel model); +} diff --git a/src/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java index 207cd8a3..5802bb48 100644 --- a/src/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/MonitorResultContainerModel.java @@ -1,55 +1,55 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -import java.util.List; - -import org.bench4q.share.models.monitor.MemoryModel; -import org.bench4q.share.models.monitor.NetworkInterfaceModel; -import org.bench4q.share.models.monitor.PhysicalDiskModel; -import org.bench4q.share.models.monitor.ProcessorModel; - -public class MonitorResultContainerModel { - private List logicalDiskModels; - private List memoryModels; - private List processorModels; - private List netWorkModels; - - public List getLogicalDiskModels() { - return logicalDiskModels; - } - - public void setLogicalDiskModels(List logicalDiskModels) { - this.logicalDiskModels = logicalDiskModels; - } - - public List getMemoryModels() { - return memoryModels; - } - - public void setMemoryModels(List memoryModels) { - this.memoryModels = memoryModels; - } - - public List getProcessorModels() { - return processorModels; - } - - public void setProcessorModels(List processorModels) { - this.processorModels = processorModels; - } - - public List getNetWorkModels() { - return netWorkModels; - } - - public void setNetWorkModels(List netWorkModels) { - this.netWorkModels = netWorkModels; - } - - public MonitorResultContainerModel() { - this.setLogicalDiskModels(new ArrayList()); - this.setMemoryModels(new ArrayList()); - this.setProcessorModels(new ArrayList()); - this.setNetWorkModels(new ArrayList()); - } -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +import java.util.List; + +import org.bench4q.share.models.monitor.MemoryModel; +import org.bench4q.share.models.monitor.NetworkInterfaceModel; +import org.bench4q.share.models.monitor.PhysicalDiskModel; +import org.bench4q.share.models.monitor.ProcessorModel; + +public class MonitorResultContainerModel { + private List logicalDiskModels; + private List memoryModels; + private List processorModels; + private List netWorkModels; + + public List getLogicalDiskModels() { + return logicalDiskModels; + } + + public void setLogicalDiskModels(List logicalDiskModels) { + this.logicalDiskModels = logicalDiskModels; + } + + public List getMemoryModels() { + return memoryModels; + } + + public void setMemoryModels(List memoryModels) { + this.memoryModels = memoryModels; + } + + public List getProcessorModels() { + return processorModels; + } + + public void setProcessorModels(List processorModels) { + this.processorModels = processorModels; + } + + public List getNetWorkModels() { + return netWorkModels; + } + + public void setNetWorkModels(List netWorkModels) { + this.netWorkModels = netWorkModels; + } + + public MonitorResultContainerModel() { + this.setLogicalDiskModels(new ArrayList()); + this.setMemoryModels(new ArrayList()); + this.setProcessorModels(new ArrayList()); + this.setNetWorkModels(new ArrayList()); + } +} diff --git a/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/OrganizeRecordPortResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OrganizeRecordPortResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/OrganizeRecordPortResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OrganizeRecordPortResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/PortModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/PortModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/PortModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/PortModel.java diff --git a/src/main/java/org/bench4q/share/models/master/ProcessResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ProcessResponseModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/ProcessResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ProcessResponseModel.java index 9d83fadb..1d9cae37 100644 --- a/src/main/java/org/bench4q/share/models/master/ProcessResponseModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ProcessResponseModel.java @@ -1,37 +1,37 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; - -import org.bench4q.share.models.master.statistics.SampleModel; -import org.bench4q.share.models.monitor.ProcessModel; - -public class ProcessResponseModel implements MonitorResultBase { - - private List processModels; - - public ProcessResponseModel() { - this.setProcessModels(new ArrayList()); - } - - @XmlElementWrapper - @XmlElement(name = "processModel") - public List getProcessModels() { - return processModels; - } - - public void setProcessModels(List processModels) { - this.processModels = processModels; - } - - public void add(SampleModel model) { - // TODO Auto-generated method stub - if (model instanceof ProcessModel) { - this.getProcessModels().add((ProcessModel) model); - } - } - -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; + +import org.bench4q.share.models.master.statistics.SampleModel; +import org.bench4q.share.models.monitor.ProcessModel; + +public class ProcessResponseModel implements MonitorResultBase { + + private List processModels; + + public ProcessResponseModel() { + this.setProcessModels(new ArrayList()); + } + + @XmlElementWrapper + @XmlElement(name = "processModel") + public List getProcessModels() { + return processModels; + } + + public void setProcessModels(List processModels) { + this.processModels = processModels; + } + + public void add(SampleModel model) { + // TODO Auto-generated method stub + if (model instanceof ProcessModel) { + this.getProcessModels().add((ProcessModel) model); + } + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/RegisterResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RegisterResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/RegisterResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RegisterResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/ResultLoadModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ResultLoadModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/ResultLoadModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ResultLoadModel.java index 0db6ddf9..90309bbe 100644 --- a/src/main/java/org/bench4q/share/models/master/ResultLoadModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ResultLoadModel.java @@ -1,27 +1,27 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "scriptProcessModel") -public class ResultLoadModel { - private List valueTimeModels; - - @XmlElementWrapper(name = "valueTimeModels") - @XmlElement(name = "valueTimeModel") - public List getValueTimeModels() { - return valueTimeModels; - } - - public void setValueTimeModels(List valueTimeModels) { - this.valueTimeModels = valueTimeModels; - } - - public ResultLoadModel() { - this.setValueTimeModels(new ArrayList()); - } -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "scriptProcessModel") +public class ResultLoadModel { + private List valueTimeModels; + + @XmlElementWrapper(name = "valueTimeModels") + @XmlElement(name = "valueTimeModel") + public List getValueTimeModels() { + return valueTimeModels; + } + + public void setValueTimeModels(List valueTimeModels) { + this.valueTimeModels = valueTimeModels; + } + + public ResultLoadModel() { + this.setValueTimeModels(new ArrayList()); + } +} diff --git a/src/main/java/org/bench4q/share/models/master/RunningAgentModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RunningAgentModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/RunningAgentModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RunningAgentModel.java diff --git a/src/main/java/org/bench4q/share/models/master/RunningScriptModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RunningScriptModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/RunningScriptModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RunningScriptModel.java index 12005eba..4f0b10fa 100644 --- a/src/main/java/org/bench4q/share/models/master/RunningScriptModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/RunningScriptModel.java @@ -1,95 +1,95 @@ -package org.bench4q.share.models.master; - -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -import org.bench4q.share.models.agent.RunScenarioModel; - -@XmlRootElement(name = "runningScripModel") -public class RunningScriptModel { - private int scriptId; - private int requireLoad; - private TestScriptConfig config; - private RunScenarioModel scenarioModel; - private String scriptName; - private boolean finished; - private List runningAgentModels = new ArrayList(); - private UUID testPlanID; - - @XmlElement - public int getScriptId() { - return scriptId; - } - - public void setScriptId(int scriptId) { - this.scriptId = scriptId; - } - - @XmlElement - public int getRequireLoad() { - return requireLoad; - } - - public void setRequireLoad(int requireLoad) { - this.requireLoad = requireLoad; - } - - @XmlElement - public TestScriptConfig getConfig() { - return config; - } - - public void setConfig(TestScriptConfig config) { - this.config = config; - } - - @XmlElement - public RunScenarioModel getScenarioModel() { - return scenarioModel; - } - - public void setScenarioModel(RunScenarioModel scenarioModel) { - this.scenarioModel = scenarioModel; - } - - @XmlElement - public String getScriptName() { - return scriptName; - } - - public void setScriptName(String scriptName) { - this.scriptName = scriptName; - } - - @XmlElement - public boolean isFinished() { - return finished; - } - - public void setFinished(boolean finished) { - this.finished = finished; - } - - @XmlElementWrapper(name = "runningAgentList") - @XmlElement - public List getRunningAgentModels() { - return runningAgentModels; - } - - public void setRunningAgentModels(List runningAgentModels) { - this.runningAgentModels = runningAgentModels; - } - - public UUID getTestPlanID() { - return testPlanID; - } - - public void setTestPlanID(UUID testPlanID) { - this.testPlanID = testPlanID; - } -} +package org.bench4q.share.models.master; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +import org.bench4q.share.models.agent.RunScenarioModel; + +@XmlRootElement(name = "runningScripModel") +public class RunningScriptModel { + private int scriptId; + private int requireLoad; + private TestScriptConfig config; + private RunScenarioModel scenarioModel; + private String scriptName; + private boolean finished; + private List runningAgentModels = new ArrayList(); + private UUID testPlanID; + + @XmlElement + public int getScriptId() { + return scriptId; + } + + public void setScriptId(int scriptId) { + this.scriptId = scriptId; + } + + @XmlElement + public int getRequireLoad() { + return requireLoad; + } + + public void setRequireLoad(int requireLoad) { + this.requireLoad = requireLoad; + } + + @XmlElement + public TestScriptConfig getConfig() { + return config; + } + + public void setConfig(TestScriptConfig config) { + this.config = config; + } + + @XmlElement + public RunScenarioModel getScenarioModel() { + return scenarioModel; + } + + public void setScenarioModel(RunScenarioModel scenarioModel) { + this.scenarioModel = scenarioModel; + } + + @XmlElement + public String getScriptName() { + return scriptName; + } + + public void setScriptName(String scriptName) { + this.scriptName = scriptName; + } + + @XmlElement + public boolean isFinished() { + return finished; + } + + public void setFinished(boolean finished) { + this.finished = finished; + } + + @XmlElementWrapper(name = "runningAgentList") + @XmlElement + public List getRunningAgentModels() { + return runningAgentModels; + } + + public void setRunningAgentModels(List runningAgentModels) { + this.runningAgentModels = runningAgentModels; + } + + public UUID getTestPlanID() { + return testPlanID; + } + + public void setTestPlanID(UUID testPlanID) { + this.testPlanID = testPlanID; + } +} diff --git a/src/main/java/org/bench4q/share/models/master/ScriptModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ScriptModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/ScriptModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ScriptModel.java diff --git a/src/main/java/org/bench4q/share/models/master/ServerStatusModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ServerStatusModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/ServerStatusModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ServerStatusModel.java diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java index beedaf72..857d0e43 100644 --- a/src/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanBehaviorsBriefResultModel.java @@ -1,26 +1,26 @@ -package org.bench4q.share.models.master; - -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.master.statistics.ScriptBehaviorsBriefModel; - -@XmlRootElement -public class TestPlanBehaviorsBriefResultModel { - private List scriptBehaviorsBriefModels; - - @XmlElementWrapper - @XmlElement - public List getScriptBehaviorsBriefModels() { - return scriptBehaviorsBriefModels; - } - - public void setScriptBehaviorsBriefModels( - List scriptBehaviorsBriefModels) { - this.scriptBehaviorsBriefModels = scriptBehaviorsBriefModels; - } - -} +package org.bench4q.share.models.master; + +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.master.statistics.ScriptBehaviorsBriefModel; + +@XmlRootElement +public class TestPlanBehaviorsBriefResultModel { + private List scriptBehaviorsBriefModels; + + @XmlElementWrapper + @XmlElement + public List getScriptBehaviorsBriefModels() { + return scriptBehaviorsBriefModels; + } + + public void setScriptBehaviorsBriefModels( + List scriptBehaviorsBriefModels) { + this.scriptBehaviorsBriefModels = scriptBehaviorsBriefModels; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/TestPlanModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanModel.java diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanResponseModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/TestPlanResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanResponseModel.java diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java index 7f8bcfe8..4ec0a1c2 100644 --- a/src/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestPlanScriptBriefResultModel.java @@ -1,26 +1,26 @@ -package org.bench4q.share.models.master; - -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.master.statistics.ScriptBriefResultModel; - -@XmlRootElement -public class TestPlanScriptBriefResultModel { - private List scriptBriefResultModels; - - @XmlElementWrapper - @XmlElement - public List getScriptBriefResultModels() { - return scriptBriefResultModels; - } - - public void setScriptBriefResultModels( - List scriptBriefResultModels) { - this.scriptBriefResultModels = scriptBriefResultModels; - } - -} +package org.bench4q.share.models.master; + +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.master.statistics.ScriptBriefResultModel; + +@XmlRootElement +public class TestPlanScriptBriefResultModel { + private List scriptBriefResultModels; + + @XmlElementWrapper + @XmlElement + public List getScriptBriefResultModels() { + return scriptBriefResultModels; + } + + public void setScriptBriefResultModels( + List scriptBriefResultModels) { + this.scriptBriefResultModels = scriptBriefResultModels; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/TestScriptConfig.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestScriptConfig.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/TestScriptConfig.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/TestScriptConfig.java diff --git a/src/main/java/org/bench4q/share/models/master/UserModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/UserModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/UserModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/UserModel.java diff --git a/src/main/java/org/bench4q/share/models/master/ValueTimeModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ValueTimeModel.java similarity index 94% rename from src/main/java/org/bench4q/share/models/master/ValueTimeModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ValueTimeModel.java index 26286ebd..b2091f22 100644 --- a/src/main/java/org/bench4q/share/models/master/ValueTimeModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/ValueTimeModel.java @@ -1,37 +1,37 @@ -package org.bench4q.share.models.master; - -import java.util.Date; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class ValueTimeModel { - private long value; - private Date time; - - @XmlElement - public long getValue() { - return value; - } - - public void setValue(long value) { - this.value = value; - } - - @XmlElement - public Date getTime() { - return time; - } - - public void setTime(Date time) { - this.time = time; - } - - public static ValueTimeModel buildValueTimeModel(long value, Date time) { - ValueTimeModel result = new ValueTimeModel(); - result.setValue(value); - result.setTime(time); - return result; - } -} +package org.bench4q.share.models.master; + +import java.util.Date; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class ValueTimeModel { + private long value; + private Date time; + + @XmlElement + public long getValue() { + return value; + } + + public void setValue(long value) { + this.value = value; + } + + @XmlElement + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public static ValueTimeModel buildValueTimeModel(long value, Date time) { + ValueTimeModel result = new ValueTimeModel(); + result.setValue(value); + result.setTime(time); + return result; + } +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/MethodModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/plugin/MethodModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodModel.java index cea01c5a..b1c4779f 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/MethodModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodModel.java @@ -1,35 +1,35 @@ -package org.bench4q.share.models.master.plugin; - -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class MethodModel { - private Set methodParams; - - private String name; - - @XmlElement - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - - @XmlElementWrapper(name = "params") - @XmlElement(name = "param", type = MethodParamModel.class) - public Set getMethodParams() { - return methodParams; - } - - public void setMethodParams(Set methodParams) { - this.methodParams = methodParams; - } - -} +package org.bench4q.share.models.master.plugin; + +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class MethodModel { + private Set methodParams; + + private String name; + + @XmlElement + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + @XmlElementWrapper(name = "params") + @XmlElement(name = "param", type = MethodParamModel.class) + public Set getMethodParams() { + return methodParams; + } + + public void setMethodParams(Set methodParams) { + this.methodParams = methodParams; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java index b3756d7b..9c135df5 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodParamModel.java @@ -1,69 +1,69 @@ -package org.bench4q.share.models.master.plugin; - -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class MethodParamModel { - private String name; - private String lable; - private ParamTypeEnum paramType; - private String valueSeperator = ";"; - private String fieldSeperator = ","; - private Set methodParamProperties; - - @XmlElement - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @XmlElement - public String getLable() { - return lable; - } - - public void setLable(String lable) { - this.lable = lable; - } -@XmlElement - public ParamTypeEnum getParamType() { - return paramType; - } - - public void setParamType(ParamTypeEnum paramType) { - this.paramType = paramType; - } - @XmlElement - public String getValueSeperator() { - return valueSeperator; - } - - public void setValueSeperator(String valueSeperator) { - this.valueSeperator = valueSeperator; - } - @XmlElement - public String getFieldSeperator() { - return fieldSeperator; - } - - public void setFieldSeperator(String fieldSeperator) { - this.fieldSeperator = fieldSeperator; - } - @XmlElement - public Set getMethodParamProperties() { - return methodParamProperties; - } - - public void setMethodParamProperties( - Set methodParamProperties) { - this.methodParamProperties = methodParamProperties; - } - - -} +package org.bench4q.share.models.master.plugin; + +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class MethodParamModel { + private String name; + private String lable; + private ParamTypeEnum paramType; + private String valueSeperator = ";"; + private String fieldSeperator = ","; + private Set methodParamProperties; + + @XmlElement + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @XmlElement + public String getLable() { + return lable; + } + + public void setLable(String lable) { + this.lable = lable; + } +@XmlElement + public ParamTypeEnum getParamType() { + return paramType; + } + + public void setParamType(ParamTypeEnum paramType) { + this.paramType = paramType; + } + @XmlElement + public String getValueSeperator() { + return valueSeperator; + } + + public void setValueSeperator(String valueSeperator) { + this.valueSeperator = valueSeperator; + } + @XmlElement + public String getFieldSeperator() { + return fieldSeperator; + } + + public void setFieldSeperator(String fieldSeperator) { + this.fieldSeperator = fieldSeperator; + } + @XmlElement + public Set getMethodParamProperties() { + return methodParamProperties; + } + + public void setMethodParamProperties( + Set methodParamProperties) { + this.methodParamProperties = methodParamProperties; + } + + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java similarity index 94% rename from src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java index f849f35b..c9d3e67a 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/MethodParamPropertyModel.java @@ -1,30 +1,30 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class MethodParamPropertyModel { - - private String key; - private String value; - - @XmlElement - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - @XmlElement - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - -} +package org.bench4q.share.models.master.plugin; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class MethodParamPropertyModel { + + private String key; + private String value; + + @XmlElement + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + @XmlElement + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java index 5e775171..ed9c38ac 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java @@ -1,6 +1,6 @@ -package org.bench4q.share.models.master.plugin; - -public enum ParamTypeEnum { - Field, MultiField, CheckBox, Table - -} +package org.bench4q.share.models.master.plugin; + +public enum ParamTypeEnum { + Field, MultiField, CheckBox, Table + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java index 4a03e125..3306ff3f 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginGUI.java @@ -1,20 +1,20 @@ -package org.bench4q.share.models.master.plugin; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "GUI") -public class PluginGUI { - - private PluginModel plugin; - - @XmlElement(name = "plugin name") - public PluginModel getPlugin() { - return plugin; - } - - public void setPlugin(PluginModel plugin) { - this.plugin = plugin; - } - -} +package org.bench4q.share.models.master.plugin; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement(name = "GUI") +public class PluginGUI { + + private PluginModel plugin; + + @XmlElement(name = "plugin name") + public PluginModel getPlugin() { + return plugin; + } + + public void setPlugin(PluginModel plugin) { + this.plugin = plugin; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/PluginModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/plugin/PluginModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginModel.java index 41149810..5a52dcb3 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/PluginModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginModel.java @@ -1,33 +1,33 @@ -package org.bench4q.share.models.master.plugin; - -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class PluginModel { - private Set methods; - private String name; - - @XmlElementWrapper(name = "methods") - @XmlElement(name = "method", type = MethodModel.class) - public Set getMethods() { - return methods; - } - - public void setMethods(Set methods) { - this.methods = methods; - } - - @XmlElement - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - -} +package org.bench4q.share.models.master.plugin; + +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class PluginModel { + private Set methods; + private String name; + + @XmlElementWrapper(name = "methods") + @XmlElement(name = "method", type = MethodModel.class) + public Set getMethods() { + return methods; + } + + public void setMethods(Set methods) { + this.methods = methods; + } + + @XmlElement + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java index 3ec8b065..e7c78ac7 100644 --- a/src/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginResponseModel.java @@ -1,66 +1,66 @@ -package org.bench4q.share.models.master.plugin; - -import java.util.List; -import java.util.Set; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class PluginResponseModel { - - private boolean success; - private List pluginList; - private List methodList; - private Set methosMethodParamModels; - private String failMessage; - - @XmlElement - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - @XmlElement - public List getPluginList() { - return pluginList; - } - - public void setPluginList(List pluginList) { - this.pluginList = pluginList; - } - - @XmlElement - public List getMethodList() { - return methodList; - } - - public void setMethodList(List methodList) { - this.methodList = methodList; - } - - @XmlElementWrapper(name = "methodParamList") - @XmlElement(name = "methodParam", type = MethodParamModel.class) - public Set getMethosMethodParamModels() { - return methosMethodParamModels; - } - - public void setMethosMethodParamModels( - Set methosMethodParamModels) { - this.methosMethodParamModels = methosMethodParamModels; - } - - @XmlElement - public String getFailMessage() { - return failMessage; - } - - public void setFailMessage(String failMessage) { - this.failMessage = failMessage; - } - -} +package org.bench4q.share.models.master.plugin; + +import java.util.List; +import java.util.Set; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class PluginResponseModel { + + private boolean success; + private List pluginList; + private List methodList; + private Set methosMethodParamModels; + private String failMessage; + + @XmlElement + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + @XmlElement + public List getPluginList() { + return pluginList; + } + + public void setPluginList(List pluginList) { + this.pluginList = pluginList; + } + + @XmlElement + public List getMethodList() { + return methodList; + } + + public void setMethodList(List methodList) { + this.methodList = methodList; + } + + @XmlElementWrapper(name = "methodParamList") + @XmlElement(name = "methodParam", type = MethodParamModel.class) + public Set getMethosMethodParamModels() { + return methosMethodParamModels; + } + + public void setMethosMethodParamModels( + Set methosMethodParamModels) { + this.methosMethodParamModels = methosMethodParamModels; + } + + @XmlElement + public String getFailMessage() { + return failMessage; + } + + public void setFailMessage(String failMessage) { + this.failMessage = failMessage; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java similarity index 95% rename from src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java index 6dbc9d5b..cc283d33 100644 --- a/src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/SampleModel.java @@ -1,21 +1,21 @@ -package org.bench4q.share.models.master.statistics; - -import java.util.Date; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public abstract class SampleModel { - protected Date samplingTime; - - @XmlElement - public Date getSamplingTime() { - return samplingTime; - } - - public void setSamplingTime(Date samplingTime) { - this.samplingTime = samplingTime; - } - -} +package org.bench4q.share.models.master.statistics; + +import java.util.Date; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public abstract class SampleModel { + protected Date samplingTime; + + @XmlElement + public Date getSamplingTime() { + return samplingTime; + } + + public void setSamplingTime(Date samplingTime) { + this.samplingTime = samplingTime; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java index 562d8cca..9c654766 100644 --- a/src/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptBehaviorsBriefModel.java @@ -1,32 +1,32 @@ -package org.bench4q.share.models.master.statistics; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -import org.bench4q.share.models.agent.statistics.AgentBehaviorsBriefModel; - -@XmlRootElement(name = "scriptBehaviorsBriefModel") -public class ScriptBehaviorsBriefModel extends SampleModel { - private boolean finished; - private AgentBehaviorsBriefModel testBehaviorsBriefModel; - - @XmlElement - public boolean isFinished() { - return finished; - } - - public void setFinished(boolean finished) { - this.finished = finished; - } - - @XmlElement - public AgentBehaviorsBriefModel getTestBehaviorsBriefModel() { - return testBehaviorsBriefModel; - } - - public void setTestBehaviorsBriefModel( - AgentBehaviorsBriefModel testBehaviorsBriefModel) { - this.testBehaviorsBriefModel = testBehaviorsBriefModel; - } - -} +package org.bench4q.share.models.master.statistics; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import org.bench4q.share.models.agent.statistics.AgentBehaviorsBriefModel; + +@XmlRootElement(name = "scriptBehaviorsBriefModel") +public class ScriptBehaviorsBriefModel extends SampleModel { + private boolean finished; + private AgentBehaviorsBriefModel testBehaviorsBriefModel; + + @XmlElement + public boolean isFinished() { + return finished; + } + + public void setFinished(boolean finished) { + this.finished = finished; + } + + @XmlElement + public AgentBehaviorsBriefModel getTestBehaviorsBriefModel() { + return testBehaviorsBriefModel; + } + + public void setTestBehaviorsBriefModel( + AgentBehaviorsBriefModel testBehaviorsBriefModel) { + this.testBehaviorsBriefModel = testBehaviorsBriefModel; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/statistics/ScriptBriefResultModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptBriefResultModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/master/statistics/ScriptBriefResultModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptBriefResultModel.java diff --git a/src/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java index 00ddddf2..15f89cd1 100644 --- a/src/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptPageBriefModel.java @@ -1,87 +1,87 @@ -package org.bench4q.share.models.master.statistics; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class ScriptPageBriefModel extends SampleModel { - private boolean finished; - private long countFromBegin; - private long maxResponseTimeFromBegin; - private long minResponseTimeFromBegin; - private long averageResponseTimeThisTime; - private long latestResponseTime; - 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; - } - - public void setCountFromBegin(long countFromBegin) { - this.countFromBegin = countFromBegin; - } - - @XmlElement - public long getMaxResponseTimeFromBegin() { - return maxResponseTimeFromBegin; - } - - public void setMaxResponseTimeFromBegin(long maxResponseTimeFromBegin) { - this.maxResponseTimeFromBegin = maxResponseTimeFromBegin; - } - - @XmlElement - public long getMinResponseTimeFromBegin() { - return minResponseTimeFromBegin; - } - - public void setMinResponseTimeFromBegin(long minResponseTimeFromBegin) { - this.minResponseTimeFromBegin = minResponseTimeFromBegin; - } - - @XmlElement - public long getAverageResponseTimeThisTime() { - return averageResponseTimeThisTime; - } - - public void setAverageResponseTimeThisTime(long averageResponseTimeThisTime) { - this.averageResponseTimeThisTime = averageResponseTimeThisTime; - } - - @XmlElement - public long getLatestResponseTime() { - return latestResponseTime; - } - - public void setLatestResponseTime(long latestResponseTime) { - this.latestResponseTime = latestResponseTime; - } - - @XmlElement - public long getThroughputThisTime() { - return throughputThisTime; - } - - public void setThroughputThisTime(long throughputThisTime) { - this.throughputThisTime = throughputThisTime; - } - - public static ScriptPageBriefModel buildInitialModel() { - ScriptPageBriefModel scriptPageBriefModel = new ScriptPageBriefModel(); - scriptPageBriefModel.setMaxResponseTimeFromBegin(Long.MIN_VALUE); - scriptPageBriefModel.setMinResponseTimeFromBegin(Long.MAX_VALUE); - return scriptPageBriefModel; - } - -} +package org.bench4q.share.models.master.statistics; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class ScriptPageBriefModel extends SampleModel { + private boolean finished; + private long countFromBegin; + private long maxResponseTimeFromBegin; + private long minResponseTimeFromBegin; + private long averageResponseTimeThisTime; + private long latestResponseTime; + 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; + } + + public void setCountFromBegin(long countFromBegin) { + this.countFromBegin = countFromBegin; + } + + @XmlElement + public long getMaxResponseTimeFromBegin() { + return maxResponseTimeFromBegin; + } + + public void setMaxResponseTimeFromBegin(long maxResponseTimeFromBegin) { + this.maxResponseTimeFromBegin = maxResponseTimeFromBegin; + } + + @XmlElement + public long getMinResponseTimeFromBegin() { + return minResponseTimeFromBegin; + } + + public void setMinResponseTimeFromBegin(long minResponseTimeFromBegin) { + this.minResponseTimeFromBegin = minResponseTimeFromBegin; + } + + @XmlElement + public long getAverageResponseTimeThisTime() { + return averageResponseTimeThisTime; + } + + public void setAverageResponseTimeThisTime(long averageResponseTimeThisTime) { + this.averageResponseTimeThisTime = averageResponseTimeThisTime; + } + + @XmlElement + public long getLatestResponseTime() { + return latestResponseTime; + } + + public void setLatestResponseTime(long latestResponseTime) { + this.latestResponseTime = latestResponseTime; + } + + @XmlElement + public long getThroughputThisTime() { + return throughputThisTime; + } + + public void setThroughputThisTime(long throughputThisTime) { + this.throughputThisTime = throughputThisTime; + } + + public static ScriptPageBriefModel buildInitialModel() { + ScriptPageBriefModel scriptPageBriefModel = new ScriptPageBriefModel(); + scriptPageBriefModel.setMaxResponseTimeFromBegin(Long.MIN_VALUE); + scriptPageBriefModel.setMinResponseTimeFromBegin(Long.MAX_VALUE); + return scriptPageBriefModel; + } + +} diff --git a/src/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java similarity index 96% rename from src/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java index 5f5af9a5..7dccdb3d 100644 --- a/src/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/statistics/ScriptPagesBriefModel.java @@ -1,30 +1,30 @@ -package org.bench4q.share.models.master.statistics; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class ScriptPagesBriefModel extends SampleModel { - private List scriptPageBriefModels; - - @XmlElementWrapper - @XmlElement - public List getScriptPageBriefModels() { - return scriptPageBriefModels; - } - - public void setScriptPageBriefModels( - List scriptPageBriefModels) { - this.scriptPageBriefModels = scriptPageBriefModels; - } - - public ScriptPagesBriefModel() { - this.setScriptPageBriefModels(new ArrayList()); - this.setSamplingTime(new Date()); - } -} +package org.bench4q.share.models.master.statistics; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class ScriptPagesBriefModel extends SampleModel { + private List scriptPageBriefModels; + + @XmlElementWrapper + @XmlElement + public List getScriptPageBriefModels() { + return scriptPageBriefModels; + } + + public void setScriptPageBriefModels( + List scriptPageBriefModels) { + this.scriptPageBriefModels = scriptPageBriefModels; + } + + public ScriptPagesBriefModel() { + this.setScriptPageBriefModels(new ArrayList()); + this.setSamplingTime(new Date()); + } +} diff --git a/src/main/java/org/bench4q/share/models/monitor/FileSystemModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/FileSystemModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/FileSystemModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/FileSystemModel.java diff --git a/src/main/java/org/bench4q/share/models/monitor/MemoryModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/MemoryModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/MemoryModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/MemoryModel.java diff --git a/src/main/java/org/bench4q/share/models/monitor/MonitorMain.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/MonitorMain.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/MonitorMain.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/MonitorMain.java diff --git a/src/main/java/org/bench4q/share/models/monitor/NetworkInterfaceModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/NetworkInterfaceModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/NetworkInterfaceModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/NetworkInterfaceModel.java diff --git a/src/main/java/org/bench4q/share/models/monitor/PhysicalDiskModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/PhysicalDiskModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/PhysicalDiskModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/PhysicalDiskModel.java diff --git a/src/main/java/org/bench4q/share/models/monitor/ProcessModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/ProcessModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessModel.java diff --git a/src/main/java/org/bench4q/share/models/monitor/ProcessModelChild.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessModelChild.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/ProcessModelChild.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessModelChild.java diff --git a/src/main/java/org/bench4q/share/models/monitor/ProcessorModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessorModel.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/ProcessorModel.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessorModel.java diff --git a/src/main/java/org/bench4q/share/models/monitor/ProcessorModelChild.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessorModelChild.java similarity index 100% rename from src/main/java/org/bench4q/share/models/monitor/ProcessorModelChild.java rename to Bench4Q-Share/src/main/java/org/bench4q/share/models/monitor/ProcessorModelChild.java diff --git a/src/test/java/org/bench4q/bench4q_share/AppTest.java b/Bench4Q-Share/src/test/java/org/bench4q/bench4q_share/AppTest.java similarity index 100% rename from src/test/java/org/bench4q/bench4q_share/AppTest.java rename to Bench4Q-Share/src/test/java/org/bench4q/bench4q_share/AppTest.java