From c75675145a8132bf5ee22860368d87b1563f31a1 Mon Sep 17 00:00:00 2001
From: Tienan Chen <chentienan@yeah.net>
Date: Mon, 18 Nov 2013 09:10:49 +0800
Subject: [PATCH] change a class address

---
 src/main/java/org/bench4q/master/api/TestPlanController.java    | 1 +
 .../java/org/bench4q/master/api/model/TestPlanResultModel.java  | 2 +-
 src/main/java/org/bench4q/master/service/TestPlanService.java   | 2 +-
 .../org/bench4q/master/{api => testPlan}/TestPlanStatus.java    | 2 +-
 src/test/java/org/bench4q/master/test/TestPlanTester.java       | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename src/main/java/org/bench4q/master/{api => testPlan}/TestPlanStatus.java (77%)

diff --git a/src/main/java/org/bench4q/master/api/TestPlanController.java b/src/main/java/org/bench4q/master/api/TestPlanController.java
index 40beddac..b2f920fc 100644
--- a/src/main/java/org/bench4q/master/api/TestPlanController.java
+++ b/src/main/java/org/bench4q/master/api/TestPlanController.java
@@ -24,6 +24,7 @@ import org.bench4q.master.service.UserService;
 import org.bench4q.master.testPlan.TestPlanContainer;
 import org.bench4q.master.testPlan.TestPlanContext;
 import org.bench4q.master.testPlan.TestPlanRunner;
+import org.bench4q.master.testPlan.TestPlanStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/src/main/java/org/bench4q/master/api/model/TestPlanResultModel.java b/src/main/java/org/bench4q/master/api/model/TestPlanResultModel.java
index 00130182..28941a65 100644
--- a/src/main/java/org/bench4q/master/api/model/TestPlanResultModel.java
+++ b/src/main/java/org/bench4q/master/api/model/TestPlanResultModel.java
@@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.bench4q.master.api.TestPlanStatus;
+import org.bench4q.master.testPlan.TestPlanStatus;
 
 @XmlRootElement(name = "RunTestPlanResultModel")
 public class TestPlanResultModel {
diff --git a/src/main/java/org/bench4q/master/service/TestPlanService.java b/src/main/java/org/bench4q/master/service/TestPlanService.java
index 22d42606..4afc8d64 100644
--- a/src/main/java/org/bench4q/master/service/TestPlanService.java
+++ b/src/main/java/org/bench4q/master/service/TestPlanService.java
@@ -11,7 +11,6 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 
 import org.apache.log4j.Logger;
-import org.bench4q.master.api.TestPlanStatus;
 import org.bench4q.master.api.model.RunningScriptModel;
 import org.bench4q.master.api.model.TestPlanModel;
 import org.bench4q.master.api.model.TestScriptConfig;
@@ -20,6 +19,7 @@ import org.bench4q.master.entity.db.TestPlan;
 import org.bench4q.master.entity.db.TestPlanScript;
 import org.bench4q.master.entity.db.User;
 import org.bench4q.master.helper.SessionHelper;
+import org.bench4q.master.testPlan.TestPlanStatus;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Restrictions;
diff --git a/src/main/java/org/bench4q/master/api/TestPlanStatus.java b/src/main/java/org/bench4q/master/testPlan/TestPlanStatus.java
similarity index 77%
rename from src/main/java/org/bench4q/master/api/TestPlanStatus.java
rename to src/main/java/org/bench4q/master/testPlan/TestPlanStatus.java
index 0c5f4044..db6478c6 100644
--- a/src/main/java/org/bench4q/master/api/TestPlanStatus.java
+++ b/src/main/java/org/bench4q/master/testPlan/TestPlanStatus.java
@@ -1,4 +1,4 @@
-package org.bench4q.master.api;
+package org.bench4q.master.testPlan;
 
 public enum TestPlanStatus {
 	NotStart, InRunning, Complete, PendingNoEnoughMaxLoad, PendingNoEnoughCurrentLoad, Error, ErrorInSubmitTask
diff --git a/src/test/java/org/bench4q/master/test/TestPlanTester.java b/src/test/java/org/bench4q/master/test/TestPlanTester.java
index aeb481a7..fcada0bb 100644
--- a/src/test/java/org/bench4q/master/test/TestPlanTester.java
+++ b/src/test/java/org/bench4q/master/test/TestPlanTester.java
@@ -14,7 +14,6 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
-import org.bench4q.master.api.TestPlanStatus;
 import org.bench4q.master.api.model.MonitorModel;
 import org.bench4q.master.api.model.RunningScriptModel;
 import org.bench4q.master.api.model.ScriptBriefResultModel;
@@ -22,6 +21,7 @@ import org.bench4q.master.api.model.TestScriptConfig;
 import org.bench4q.master.api.model.TestPlanModel;
 import org.bench4q.master.api.model.TestPlanResultModel;
 import org.bench4q.master.communication.HttpRequester.HttpResponse;
+import org.bench4q.master.testPlan.TestPlanStatus;
 
 public class TestPlanTester extends TestBase {
 	private TestPlanModel testPlan = new TestPlanModel();