diff --git a/mars-core/src/main/java/com/mars/core/annotation/MarsScan.java b/mars-core/src/main/java/com/mars/core/annotation/MarsScanner.java similarity index 84% rename from mars-core/src/main/java/com/mars/core/annotation/MarsScan.java rename to mars-core/src/main/java/com/mars/core/annotation/MarsScanner.java index 78f764f..e76fba4 100644 --- a/mars-core/src/main/java/com/mars/core/annotation/MarsScan.java +++ b/mars-core/src/main/java/com/mars/core/annotation/MarsScanner.java @@ -5,6 +5,6 @@ import java.lang.annotation.*; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented -public @interface MarsScan { +public @interface MarsScanner { String[] packageName(); } diff --git a/mars-start-pure/pom.xml b/mars-starter/pom.xml similarity index 96% rename from mars-start-pure/pom.xml rename to mars-starter/pom.xml index 56f1b14..eb17744 100644 --- a/mars-start-pure/pom.xml +++ b/mars-starter/pom.xml @@ -8,7 +8,7 @@ com.github.yuyenews 3.0.15 - mars-start-pure + mars-starter diff --git a/mars-start-pure/src/main/java/com/mars/start/StartMars.java b/mars-starter/src/main/java/com/mars/start/StartMars.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/StartMars.java rename to mars-starter/src/main/java/com/mars/start/StartMars.java diff --git a/mars-start-pure/src/main/java/com/mars/start/base/BaseJunit.java b/mars-starter/src/main/java/com/mars/start/base/BaseJunit.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/base/BaseJunit.java rename to mars-starter/src/main/java/com/mars/start/base/BaseJunit.java diff --git a/mars-start-pure/src/main/java/com/mars/start/base/BaseStartMars.java b/mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/base/BaseStartMars.java rename to mars-starter/src/main/java/com/mars/start/base/BaseStartMars.java diff --git a/mars-start-pure/src/main/java/com/mars/start/base/MarsJunitStart.java b/mars-starter/src/main/java/com/mars/start/base/MarsJunitStart.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/base/MarsJunitStart.java rename to mars-starter/src/main/java/com/mars/start/base/MarsJunitStart.java diff --git a/mars-start-pure/src/main/java/com/mars/start/base/StartLoad.java b/mars-starter/src/main/java/com/mars/start/base/StartLoad.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/base/StartLoad.java rename to mars-starter/src/main/java/com/mars/start/base/StartLoad.java diff --git a/mars-start-pure/src/main/java/com/mars/start/junit/MarsJunit.java b/mars-starter/src/main/java/com/mars/start/junit/MarsJunit.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/junit/MarsJunit.java rename to mars-starter/src/main/java/com/mars/start/junit/MarsJunit.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/StartLoadList.java b/mars-starter/src/main/java/com/mars/start/startmap/StartLoadList.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/StartLoadList.java rename to mars-starter/src/main/java/com/mars/start/startmap/StartLoadList.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/StartMap.java b/mars-starter/src/main/java/com/mars/start/startmap/StartMap.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/StartMap.java rename to mars-starter/src/main/java/com/mars/start/startmap/StartMap.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/StartParam.java b/mars-starter/src/main/java/com/mars/start/startmap/StartParam.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/StartParam.java rename to mars-starter/src/main/java/com/mars/start/startmap/StartParam.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/HasStart.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/HasStart.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/HasStart.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/HasStart.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartBeanObject.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartBeanObject.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartBeanObject.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartBeanObject.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartBeans.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartBeans.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartBeans.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartBeans.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartCoreServlet.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartCoreServlet.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartCoreServlet.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartCoreServlet.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartExecuteTimer.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartExecuteTimer.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartExecuteTimer.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartExecuteTimer.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartInter.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartInter.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartInter.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartInter.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartJDBC.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartJDBC.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartJDBC.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartJDBC.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartLoadAfter.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartLoadAfter.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartLoadAfter.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartLoadAfter.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartLoadClass.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartLoadClass.java similarity index 88% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartLoadClass.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartLoadClass.java index e5e206a..e9e33bf 100644 --- a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartLoadClass.java +++ b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartLoadClass.java @@ -1,6 +1,6 @@ package com.mars.start.startmap.impl; -import com.mars.core.annotation.MarsScan; +import com.mars.core.annotation.MarsScanner; import com.mars.core.load.LoadClass; import com.mars.start.startmap.StartMap; import com.mars.start.startmap.StartParam; @@ -37,9 +37,9 @@ public class StartLoadClass implements StartMap { Class cls = startParam.getClazz(); String[] classNameList = null; - MarsScan marsScan = cls.getAnnotation(MarsScan.class); - if (marsScan != null) { - classNameList = marsScan.packageName(); + MarsScanner marsScanner = cls.getAnnotation(MarsScanner.class); + if (marsScanner != null) { + classNameList = marsScanner.packageName(); } else { String cName = cls.getName(); if (cName.lastIndexOf(".") > 0) { diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartMarsApi.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartMarsApi.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartMarsApi.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartMarsApi.java diff --git a/mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartMarsTimer.java b/mars-starter/src/main/java/com/mars/start/startmap/impl/StartMarsTimer.java similarity index 100% rename from mars-start-pure/src/main/java/com/mars/start/startmap/impl/StartMarsTimer.java rename to mars-starter/src/main/java/com/mars/start/startmap/impl/StartMarsTimer.java diff --git a/pom.xml b/pom.xml index 7bae5c1..ed6e5dd 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ mars-server mars-jdbc mars-redis - mars-start-pure + mars-starter