rename soul to shenyu for classes and files (apache#1416)

MarcusJiang1306 · May 8, 2021 · 7c0bd98 · 7c0bd98
1 parent 02d3929
commit 7c0bd98
Show file tree

Hide file tree

Showing 358 changed files with 2,609 additions and 2,665 deletions.
diff --git a/.github/actions/skip-ci/action.yml b/.github/actions/skip-ci/action.yml
@@ -26,7 +26,7 @@ inputs:
     required: false
     default: >-
       "*.md"
-      "soul-dashboard"
+      "shenyu-dashboard"
 
 runs:
   using: "composite"

diff --git a/README.md b/README.md
@@ -172,13 +172,13 @@
         
 # Stargazers over time
 
-[![Stargazers over time](https://starchart.cc/Dromara/soul.svg)](https://starchart.cc/Dromara/soul)
+[![Stargazers over time](https://starchart.cc/dromara/soul.svg)](https://starchart.cc/dromara/soul)
 
 --------------------------------------------------------------------------------  
 
 # Known Users
 
-In order of registration, More access companies are welcome to register at [https://github.com/Dromara/soul/issues/68](https://github.com/Dromara/soul/issues/68) (For open source users only)
+In order of registration, More access companies are welcome to register at [https://github.com/dromara/soul/issues/68](https://github.com/dromara/soul/issues/68) (For open source users only)
 
 <table>
   <tbody>
@@ -246,24 +246,3 @@ In order of registration, More access companies are welcome to register at [http
     </tr>
   </tbody> 
 </table>
-
-# Support  
-
-<table>
-  <thead>
-    <th>WeChat</th>
-    <th>QQ</th>
-    <th>Taro Source</th>
-    <th>JetBrains</th>
-  </thead>
-  <tbody>
-    <tr>
-      <td><img src="https://yu199195.github.io/images/public.jpg"   alt="WeChat"/>
-      <td><img src="https://yu199195.github.io/images/soul-qq.png"  alt="QQ group"/>
-      <td><img src="http://www.iocoder.cn/images/common/erweima.jpg"  alt="yuNai"/>
-      <td><img src="https://yu199195.github.io/images/jetbrains.svg"  alt="Jetbrains"/>
-    </tr>
-  </tbody>
-</table>
-
-
diff --git a/README_CN.md b/README_CN.md
@@ -257,25 +257,3 @@ ShenYu 已经被很多公司广泛使用在越来越多的业务系统，它能
 感谢每一位为 `ShenYu` 贡献代码的朋友。
 
 [![Giteye chart](https://chart.giteye.net/gitee/dromara/soul/2ZKY3P9W.png)](https://giteye.net/chart/2ZKY3P9W)
-
-# 支持
-
-<table>
-  <thead>
-    <th>微信公众号</th>
-    <th>QQ 交流群</th>
-    <th>芋道源码</th>
-    <th>JetBrains</th>
-  </thead>
-  <tbody>
-    <tr>
-      <td><img src="https://yu199195.github.io/images/public.jpg"   alt="微信公众号"/>
-      <td><img src="https://yu199195.github.io/images/soul-qq.png"  alt="QQ 交流群"/>
-      <td><img src="http://www.iocoder.cn/images/common/erweima.jpg"  alt="芋道源码"/>
-      <td><img src="https://yu199195.github.io/images/jetbrains.svg"  alt="JetBrains"/>
-    </tr>
-  </tbody>
-</table>
-
-
-
diff --git a/pom.xml b/pom.xml
@@ -41,11 +41,6 @@
         <module>shenyu-disruptor</module>
     </modules>
 
-    <organization>
-        <name>dromara</name>
-        <url>http://www.dromara.org</url>
-    </organization>
-
     <licenses>
         <license>
             <name>Apache License, Version 2.0</name>
@@ -54,29 +49,17 @@
         </license>
     </licenses>
     <scm>
-        <url>https://github.com/Dromara/soul.git</url>
-        <connection>scm:git:https://github.com/Dromara/soul</connection>
-        <developerConnection>scm:git:[email protected]:Dromara/soul</developerConnection>
+        <url>https://github.com/dromara/shenyu.git</url>
+        <connection>scm:git:https://github.com/dromara/shenyu</connection>
+        <developerConnection>scm:git:[email protected]:dromara/shenyu</developerConnection>
         <tag>${project.version}</tag>
     </scm>
 
     <issueManagement>
         <system>GitHub Issues</system>
-        <url>https://github.com/Dromara/soul/issues</url>
+        <url>https://github.com/dromara/shenyu/issues</url>
     </issueManagement>
 
-    <developers>
-        <developer>
-            <id>xiaoyu</id>
-            <name>xiaoyu(Myth)</name>
-            <email>[email protected]</email>
-            <organization>org.apache.shenyu</organization>
-            <roles>
-                <role>author</role>
-            </roles>
-        </developer>
-    </developers>
-
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -180,7 +163,6 @@
                 <version>${mapstruct.version}</version>
             </dependency>
 
-            <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
@@ -413,10 +395,6 @@
             <scope>test</scope>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>ch.qos.logback</groupId>-->
-<!--            <artifactId>logback-classic</artifactId>-->
-<!--        </dependency>-->
     </dependencies>
 
     <distributionManagement>
@@ -537,7 +515,7 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>${maven-checkstyle-plugin.version}</version>
                 <configuration>
-                    <configLocation>/script/soul_checkstyle.xml</configLocation>
+                    <configLocation>/script/shenyu_checkstyle.xml</configLocation>
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
                     <excludes>**/transfer/**/*</excludes>
                 </configuration>
@@ -613,7 +591,7 @@
                         <exclude>**/*.txt</exclude>
                         <exclude>**/docs/**</exclude>
                         <!-- UI files -->
-                        <exclude>/soul-dashboard/**</exclude>
+                        <exclude>/shenyu-dashboard/**</exclude>
                         <exclude>**/resources/static/</exclude>
                     </excludes>
                 </configuration>

diff --git a/script/soul_checkstyle.xml → script/shenyu_checkstyle.xml b/script/soul_checkstyle.xml → script/shenyu_checkstyle.xml
diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
@@ -242,7 +242,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>org.apache.shenyu.admin.SoulAdminBootstrap</mainClass>
+                    <mainClass>org.apache.shenyu.admin.ShenyuAdminBootstrap</mainClass>
                     <executable>true</executable>
                 </configuration>
                 <executions>

diff --git a/...ache/shenyu/admin/SoulAdminBootstrap.java → ...he/shenyu/admin/ShenyuAdminBootstrap.java b/...ache/shenyu/admin/SoulAdminBootstrap.java → ...he/shenyu/admin/ShenyuAdminBootstrap.java
@@ -22,20 +22,18 @@
 import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration;
 
 /**
- * soul admin start.
- *
- * @author xiaoyu(Myth)
+ * shenyu admin start.
  */
 @SpringBootApplication(exclude = {LdapAutoConfiguration.class})
-public class SoulAdminBootstrap {
+public class ShenyuAdminBootstrap {
 
     /**
      * Main entrance.
      *
      * @param args startup arguments
      */
     public static void main(final String[] args) {
-        SpringApplication.run(SoulAdminBootstrap.class, args);
+        SpringApplication.run(ShenyuAdminBootstrap.class, args);
     }
 }
 
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/ConsulServerConfiguration.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/ConsulServerConfiguration.java
@@ -17,8 +17,8 @@
 
 package org.apache.shenyu.admin.config;
 
-import org.apache.shenyu.register.common.config.SoulRegisterCenterConfig;
-import org.apache.shenyu.register.server.consul.SoulConsulConfigWatch;
+import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
+import org.apache.shenyu.register.server.consul.ShenyuConsulConfigWatch;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Bean;
@@ -29,14 +29,14 @@
 public class ConsulServerConfiguration {
 
     /**
-     * Register soulConsulConfigWatch for ConsulServerRegisterRepository to monitor metadata.
+     * Register shenyuConsulConfigWatch for ConsulServerRegisterRepository to monitor metadata.
      *
-     * @param config the soul register center config
+     * @param config the shenyu register center config
      * @param publisher the application event publisher
      * @return the consul config watch
      */
     @Bean
-    public SoulConsulConfigWatch soulConsulConfigWatch(final SoulRegisterCenterConfig config, final ApplicationEventPublisher publisher) {
-        return new SoulConsulConfigWatch(config, publisher);
+    public ShenyuConsulConfigWatch shenyuConsulConfigWatch(final ShenyuRegisterCenterConfig config, final ApplicationEventPublisher publisher) {
+        return new ShenyuConsulConfigWatch(config, publisher);
     }
 }
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/RegisterCenterConfiguration.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/config/RegisterCenterConfiguration.java
@@ -19,49 +19,47 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shenyu.admin.disruptor.RegisterServerDisruptorPublisher;
-import org.apache.shenyu.admin.service.SoulClientRegisterService;
-import org.apache.shenyu.register.common.config.SoulRegisterCenterConfig;
-import org.apache.shenyu.register.server.api.SoulServerRegisterRepository;
+import org.apache.shenyu.admin.service.ShenyuClientRegisterService;
+import org.apache.shenyu.register.common.config.ShenyuRegisterCenterConfig;
+import org.apache.shenyu.register.server.api.ShenyuServerRegisterRepository;
 import org.apache.shenyu.spi.ExtensionLoader;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * The type Register center configuration.
- *
- * @author xiaoyu
  */
 @Slf4j
 @Configuration
 public class RegisterCenterConfiguration {
 
     /**
-     * Soul register center config soul register center config.
+     * Shenyu register center config shenyu register center config.
      *
-     * @return the soul register center config
+     * @return the shenyu register center config
      */
     @Bean
     @ConfigurationProperties(prefix = "soul.register")
-    public SoulRegisterCenterConfig soulRegisterCenterConfig() {
-        return new SoulRegisterCenterConfig();
+    public ShenyuRegisterCenterConfig shenyuRegisterCenterConfig() {
+        return new ShenyuRegisterCenterConfig();
     }
 
     /**
-     * Soul server register repository soul server register repository.
+     * Shenyu server register repository server register repository.
      *
-     * @param soulRegisterCenterConfig the soul register center config
-     * @param soulClientRegisterService the soul client register service
-     * @return the soul server register repository
+     * @param shenyuRegisterCenterConfig the shenyu register center config
+     * @param shenyuClientRegisterService the shenyu client register service
+     * @return the shenyu server register repository
      */
     @Bean
-    public SoulServerRegisterRepository soulServerRegisterRepository(final SoulRegisterCenterConfig soulRegisterCenterConfig, 
-                                                                     final SoulClientRegisterService soulClientRegisterService) {
-        String registerType = soulRegisterCenterConfig.getRegisterType();
-        SoulServerRegisterRepository registerRepository = ExtensionLoader.getExtensionLoader(SoulServerRegisterRepository.class).getJoin(registerType);
+    public ShenyuServerRegisterRepository shenyuServerRegisterRepository(final ShenyuRegisterCenterConfig shenyuRegisterCenterConfig,
+                                                                         final ShenyuClientRegisterService shenyuClientRegisterService) {
+        String registerType = shenyuRegisterCenterConfig.getRegisterType();
+        ShenyuServerRegisterRepository registerRepository = ExtensionLoader.getExtensionLoader(ShenyuServerRegisterRepository.class).getJoin(registerType);
         RegisterServerDisruptorPublisher publisher = RegisterServerDisruptorPublisher.getInstance();
-        publisher.start(soulClientRegisterService);
-        registerRepository.init(publisher, soulRegisterCenterConfig);
+        publisher.start(shenyuClientRegisterService);
+        registerRepository.init(publisher, shenyuRegisterCenterConfig);
         return registerRepository;
     }
 }