From 98d54b318373efb3da9b987b5b103ae9661add61 Mon Sep 17 00:00:00 2001 From: haifeng414 Date: Wed, 19 Feb 2020 18:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/{runner => engine}/Engine.java | 2 +- .../{runner => engine}/EngineContext.java | 2 +- .../{runner => engine}/EngineFactory.java | 4 ++-- .../metersphere/{runner => engine}/EngineThread.java | 2 +- .../{runner => engine}/jmx/JmxEngine.java | 12 ++++++------ .../jmx/client/DistributedRunner.java | 2 +- .../jmx/client/JmeterProperties.java | 2 +- .../java/io/metersphere/service/LoadTestService.java | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) rename backend/src/main/java/io/metersphere/{runner => engine}/Engine.java (77%) rename backend/src/main/java/io/metersphere/{runner => engine}/EngineContext.java (93%) rename backend/src/main/java/io/metersphere/{runner => engine}/EngineFactory.java (92%) rename backend/src/main/java/io/metersphere/{runner => engine}/EngineThread.java (97%) rename backend/src/main/java/io/metersphere/{runner => engine}/jmx/JmxEngine.java (91%) rename backend/src/main/java/io/metersphere/{runner => engine}/jmx/client/DistributedRunner.java (99%) rename backend/src/main/java/io/metersphere/{runner => engine}/jmx/client/JmeterProperties.java (98%) diff --git a/backend/src/main/java/io/metersphere/runner/Engine.java b/backend/src/main/java/io/metersphere/engine/Engine.java similarity index 77% rename from backend/src/main/java/io/metersphere/runner/Engine.java rename to backend/src/main/java/io/metersphere/engine/Engine.java index a93023b6f1..fc0c0ad2bf 100644 --- a/backend/src/main/java/io/metersphere/runner/Engine.java +++ b/backend/src/main/java/io/metersphere/engine/Engine.java @@ -1,4 +1,4 @@ -package io.metersphere.runner; +package io.metersphere.engine; public interface Engine { boolean init(EngineContext context); diff --git a/backend/src/main/java/io/metersphere/runner/EngineContext.java b/backend/src/main/java/io/metersphere/engine/EngineContext.java similarity index 93% rename from backend/src/main/java/io/metersphere/runner/EngineContext.java rename to backend/src/main/java/io/metersphere/engine/EngineContext.java index b6b5e890fe..94711a1973 100644 --- a/backend/src/main/java/io/metersphere/runner/EngineContext.java +++ b/backend/src/main/java/io/metersphere/engine/EngineContext.java @@ -1,4 +1,4 @@ -package io.metersphere.runner; +package io.metersphere.engine; import java.io.InputStream; diff --git a/backend/src/main/java/io/metersphere/runner/EngineFactory.java b/backend/src/main/java/io/metersphere/engine/EngineFactory.java similarity index 92% rename from backend/src/main/java/io/metersphere/runner/EngineFactory.java rename to backend/src/main/java/io/metersphere/engine/EngineFactory.java index 7b5b3a2bf7..b7a6c81e96 100644 --- a/backend/src/main/java/io/metersphere/runner/EngineFactory.java +++ b/backend/src/main/java/io/metersphere/engine/EngineFactory.java @@ -1,9 +1,9 @@ -package io.metersphere.runner; +package io.metersphere.engine; import io.metersphere.base.domain.FileContent; import io.metersphere.base.domain.LoadTestWithBLOBs; import io.metersphere.commons.constants.LoadTestFileType; -import io.metersphere.runner.jmx.JmxEngine; +import io.metersphere.engine.jmx.JmxEngine; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; diff --git a/backend/src/main/java/io/metersphere/runner/EngineThread.java b/backend/src/main/java/io/metersphere/engine/EngineThread.java similarity index 97% rename from backend/src/main/java/io/metersphere/runner/EngineThread.java rename to backend/src/main/java/io/metersphere/engine/EngineThread.java index 2b3843cae1..c37ed127f8 100644 --- a/backend/src/main/java/io/metersphere/runner/EngineThread.java +++ b/backend/src/main/java/io/metersphere/engine/EngineThread.java @@ -1,4 +1,4 @@ -package io.metersphere.runner; +package io.metersphere.engine; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/backend/src/main/java/io/metersphere/runner/jmx/JmxEngine.java b/backend/src/main/java/io/metersphere/engine/jmx/JmxEngine.java similarity index 91% rename from backend/src/main/java/io/metersphere/runner/jmx/JmxEngine.java rename to backend/src/main/java/io/metersphere/engine/jmx/JmxEngine.java index 78fc4e36ad..19c92c1b14 100644 --- a/backend/src/main/java/io/metersphere/runner/jmx/JmxEngine.java +++ b/backend/src/main/java/io/metersphere/engine/jmx/JmxEngine.java @@ -1,10 +1,10 @@ -package io.metersphere.runner.jmx; +package io.metersphere.engine.jmx; -import io.metersphere.runner.Engine; -import io.metersphere.runner.EngineContext; -import io.metersphere.runner.EngineThread; -import io.metersphere.runner.jmx.client.DistributedRunner; -import io.metersphere.runner.jmx.client.JmeterProperties; +import io.metersphere.engine.Engine; +import io.metersphere.engine.EngineContext; +import io.metersphere.engine.EngineThread; +import io.metersphere.engine.jmx.client.DistributedRunner; +import io.metersphere.engine.jmx.client.JmeterProperties; import org.apache.jmeter.JMeter; import org.apache.jmeter.save.SaveService; import org.apache.jmeter.services.FileServer; diff --git a/backend/src/main/java/io/metersphere/runner/jmx/client/DistributedRunner.java b/backend/src/main/java/io/metersphere/engine/jmx/client/DistributedRunner.java similarity index 99% rename from backend/src/main/java/io/metersphere/runner/jmx/client/DistributedRunner.java rename to backend/src/main/java/io/metersphere/engine/jmx/client/DistributedRunner.java index 60305e6e9b..ffd02c3e74 100644 --- a/backend/src/main/java/io/metersphere/runner/jmx/client/DistributedRunner.java +++ b/backend/src/main/java/io/metersphere/engine/jmx/client/DistributedRunner.java @@ -1,4 +1,4 @@ -package io.metersphere.runner.jmx.client; +package io.metersphere.engine.jmx.client; import org.apache.jmeter.engine.ClientJMeterEngine; import org.apache.jmeter.engine.JMeterEngine; diff --git a/backend/src/main/java/io/metersphere/runner/jmx/client/JmeterProperties.java b/backend/src/main/java/io/metersphere/engine/jmx/client/JmeterProperties.java similarity index 98% rename from backend/src/main/java/io/metersphere/runner/jmx/client/JmeterProperties.java rename to backend/src/main/java/io/metersphere/engine/jmx/client/JmeterProperties.java index b2be78e7bf..169f584402 100644 --- a/backend/src/main/java/io/metersphere/runner/jmx/client/JmeterProperties.java +++ b/backend/src/main/java/io/metersphere/engine/jmx/client/JmeterProperties.java @@ -1,4 +1,4 @@ -package io.metersphere.runner.jmx.client; +package io.metersphere.engine.jmx.client; import org.apache.jmeter.util.JMeterUtils; import org.slf4j.Logger; diff --git a/backend/src/main/java/io/metersphere/service/LoadTestService.java b/backend/src/main/java/io/metersphere/service/LoadTestService.java index 56c0af6ac0..6c77ce116a 100644 --- a/backend/src/main/java/io/metersphere/service/LoadTestService.java +++ b/backend/src/main/java/io/metersphere/service/LoadTestService.java @@ -8,8 +8,8 @@ import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.IOUtils; import io.metersphere.controller.request.testplan.*; import io.metersphere.dto.LoadTestDTO; -import io.metersphere.runner.Engine; -import io.metersphere.runner.EngineFactory; +import io.metersphere.engine.Engine; +import io.metersphere.engine.EngineFactory; import org.apache.commons.lang3.RandomUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;