diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 4a2ef97cb0e8e2b2115608696dd4adc5b13616b1..46fdeda8c46ae4a38d30ffed4faff121029c96c6 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -4,6 +4,7 @@
+
@@ -18,7 +19,7 @@
-
+
src/main/java
@@ -34,7 +35,7 @@
-
+
src/main/java
@@ -50,7 +51,7 @@
-
+
src/main/java
@@ -66,7 +67,7 @@
-
+
src/main/java
@@ -88,7 +89,7 @@
-
+
src/main/java
@@ -104,7 +105,7 @@
-
+
src/main/java
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml b/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
deleted file mode 100644
index d4096761d17ec66971d56915e0d117d38c62696b..0000000000000000000000000000000000000000
--- a/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/resources/application.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-spring:
- application:
- name: ${rootArtifactId}
-apollo:
- bootstrap:
- namespaces: application,kp.common.spring.jdbc,kp.common.eureka
\ No newline at end of file
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
similarity index 78%
rename from src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
index 5db6c645c2444ea651eb20734365c65e3478a6d7..f5251aebd55117d639a44e7b065ccd32aa44b10f 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-api-impl/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml
@@ -11,7 +11,7 @@
${revision}
- ${artifactId}
+ ${subModuleNamePrefix}-api-impl
true
@@ -20,11 +20,11 @@
${groupId}
- ${rootArtifactId}-api
+ ${subModuleNamePrefix}-api
${groupId}
- ${rootArtifactId}-service
+ ${subModuleNamePrefix}-service
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
similarity index 85%
rename from src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
index b3850a20538f008bb74d681c4e32309e2f4eb1b6..8120ab0b1c9eac1c73def9c9cef3c6a8e228c99a 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml
@@ -11,12 +11,12 @@
${revision}
- ${artifactId}
+ ${subModuleNamePrefix}-api
${groupId}
- ${rootArtifactId}-common
+ ${subModuleNamePrefix}-common
org.springframework.cloud
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
similarity index 90%
rename from src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
index 7dc9ef367487f40671723055215eeb488992e75b..1a7e22a7d68afa5e874f5d992d2312be6576f899 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-common/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml
@@ -11,7 +11,7 @@
${revision}
- ${artifactId}
+ ${subModuleNamePrefix}-common
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dao/pom.xml
similarity index 88%
rename from src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-dao/pom.xml
index ff6f9bf5e02acf5ae4e9af67359d59d3827fecce..2ca72a118eb789d6779623d7ca9e32bfa0073885 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-dao/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-dao/pom.xml
@@ -11,7 +11,7 @@
${revision}
- ${artifactId}
+ ${subModuleNamePrefix}-dao
true
@@ -20,7 +20,7 @@
${groupId}
- ${rootArtifactId}-common
+ ${subModuleNamePrefix}-common
com.schbrain.framework
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
similarity index 88%
rename from src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
index 073b427efef66e760ec4698273d5b5506427b8d2..c5d026e44581ac7ccb5649eba20c6bcf36caec54 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-service/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml
@@ -11,7 +11,7 @@
${revision}
- ${artifactId}
+ ${subModuleNamePrefix}-service
true
@@ -20,11 +20,11 @@
${groupId}
- ${rootArtifactId}-dao
+ ${subModuleNamePrefix}-dao
${groupId}
- ${rootArtifactId}-api
+ ${subModuleNamePrefix}-api
com.schbrain.framework
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
similarity index 92%
rename from src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
index a09cdb13d348a8fb0d2480061ce552ae2df6c9b1..2bdcf48cc4d0c4b4b4b1c8c0cd09a61033778acb 100644
--- a/src/main/resources/archetype-resources/__rootArtifactId__-web/pom.xml
+++ b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml
@@ -11,7 +11,7 @@
${revision}
- ${rootArtifactId}-web
+ ${subModuleNamePrefix}-web
true
@@ -20,7 +20,7 @@
${groupId}
- ${rootArtifactId}-api-impl
+ ${subModuleNamePrefix}-api-impl
com.schbrain.common
diff --git a/src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java b/src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/java/Application.java
similarity index 100%
rename from src/main/resources/archetype-resources/__rootArtifactId__-web/src/main/java/Application.java
rename to src/main/resources/archetype-resources/__subModuleNamePrefix__-web/src/main/java/Application.java
diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml
index fbab78e5a5742037def329fd2782a7077dc2dce9..ff2d1155959ce681189046d3e2a732950cfed904 100644
--- a/src/main/resources/archetype-resources/pom.xml
+++ b/src/main/resources/archetype-resources/pom.xml
@@ -21,39 +21,39 @@
- ${rootArtifactId}-api
- ${rootArtifactId}-api-impl
- ${rootArtifactId}-common
- ${rootArtifactId}-dao
- ${rootArtifactId}-service
- ${rootArtifactId}-web
+ ${subModuleNamePrefix}-api
+ ${subModuleNamePrefix}-api-impl
+ ${subModuleNamePrefix}-common
+ ${subModuleNamePrefix}-dao
+ ${subModuleNamePrefix}-service
+ ${subModuleNamePrefix}-web
${groupId}
- ${rootArtifactId}-api
+ ${subModuleNamePrefix}-api
${project.version}
${groupId}
- ${rootArtifactId}-api-impl
+ ${subModuleNamePrefix}-api-impl
${project.version}
${groupId}
- ${rootArtifactId}-common
+ ${subModuleNamePrefix}-common
${project.version}
${groupId}
- ${rootArtifactId}-dao
+ ${subModuleNamePrefix}-dao
${project.version}
${groupId}
- ${rootArtifactId}-service
+ ${subModuleNamePrefix}-service
${project.version}