[shardingsphere] branch master updated: Adjust sample module names (#15081)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 09ba27f  Adjust sample module names (#15081)
09ba27f is described below

commit 09ba27f05493e3338a80ca75de4cdc0d35417920
Author: Guocheng Tang <to...@qq.com>
AuthorDate: Wed Jan 26 19:00:10 2022 +0800

    Adjust sample module names (#15081)
---
 .../org/apache/shardingsphere/example/generator/ExampleGenerator.java | 2 +-
 .../src/main/resources/data-model/data-model.yaml                     | 1 +
 .../src/main/resources/template/pom.ftl                               | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
index eb5e2b2..081237b 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/java/org/apache/shardingsphere/example/generator/ExampleGenerator.java
@@ -48,7 +48,7 @@ public final class ExampleGenerator {
             + "<#else>"
             + "<#assign package=feature />"
             + "</#if>"
-            + "/shardingsphere-jdbc-sample/shardingsphere-jdbc-${mode}-${transaction}-${package}-${framework}-example/";
+            + "/shardingsphere-${product}-sample/${package}--${framework}--${mode}--${transaction}/";
     
     private static final String JAVA_CLASS_PATH = "src/main/java/org/apache/shardingsphere/example/"
             + "<#assign package=\"\">"
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
index 232792c..ee571a7 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/data-model/data-model.yaml
@@ -15,6 +15,7 @@
 # limitations under the License.
 #
 
+product: jdbc
 mode: memory
 transaction: local
 feature: sharding,readwrite-splitting,encrypt
diff --git a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/pom.ftl b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/pom.ftl
index c08462b..99a6c34 100644
--- a/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/pom.ftl
+++ b/examples/shardingsphere-sample/shardingsphere-example-generator/src/main/resources/template/pom.ftl
@@ -28,10 +28,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere.example</groupId>
-        <artifactId>shardingsphere-jdbc-sample</artifactId>
+        <artifactId>shardingsphere-${product}-sample</artifactId>
         <version>${r'${revision}'}</version>
     </parent>
-    <artifactId>shardingsphere-jdbc-${mode}-${transaction}-${package}-${framework}-example</artifactId>
+    <artifactId>${package}--${framework}--${mode}--${transaction}</artifactId>
     <name>${r'${project.artifactId}'}</name>
     
     <dependencies>