This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 2f98647a6ad Unify agent-logging module structure (#23251)
2f98647a6ad is described below
commit 2f98647a6ad7da151f8913b8ab2ffb8112f01e41
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jan 2 00:50:42 2023 +0800
Unify agent-logging module structure (#23251)
* Unify agent-logging module structure
---
.../shardingsphere-agent-binary-distribution.xml | 20 ++++++++++----------
agent/plugins/logging/pom.xml | 2 +-
agent/plugins/logging/{ => type}/base/pom.xml | 4 ++--
.../logging/base/BaseLoggingPluginBootService.java | 0
.../base/advice/MetaDataContextsFactoryAdvice.java | 0
...apache.shardingsphere.agent.spi.PluginBootService | 0
.../src/main/resources/baselogging/advisors.yaml | 0
agent/plugins/logging/{ => type}/pom.xml | 13 ++-----------
8 files changed, 15 insertions(+), 24 deletions(-)
diff --git
a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
index 4a298cc721b..6309cae0e4c 100644
---
a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
+++
b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml
@@ -40,37 +40,37 @@
</fileSet>
<fileSet>
- <directory>../plugins/logging/base/target/plugins</directory>
- <outputDirectory>./plugins</outputDirectory>
+ <directory>../plugins/core/target/lib</directory>
+ <outputDirectory>./lib</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
-
<fileSet>
- <directory>../plugins/tracing/type/target/plugins</directory>
- <outputDirectory>./plugins</outputDirectory>
+ <directory>../plugins/metrics/core/target/lib</directory>
+ <outputDirectory>./lib</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
+
<fileSet>
- <directory>../plugins/metrics/type/target/plugins</directory>
+ <directory>../plugins/logging/type/target/plugins</directory>
<outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>../plugins/core/target/lib</directory>
- <outputDirectory>./lib</outputDirectory>
+ <directory>../plugins/tracing/type/target/plugins</directory>
+ <outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
</fileSet>
<fileSet>
- <directory>../plugins/metrics/core/target/lib</directory>
- <outputDirectory>./lib</outputDirectory>
+ <directory>../plugins/metrics/type/target/plugins</directory>
+ <outputDirectory>./plugins</outputDirectory>
<includes>
<include>**.jar</include>
</includes>
diff --git a/agent/plugins/logging/pom.xml b/agent/plugins/logging/pom.xml
index 1d1533c4a2b..ff830bc3318 100644
--- a/agent/plugins/logging/pom.xml
+++ b/agent/plugins/logging/pom.xml
@@ -29,7 +29,7 @@
<name>${project.artifactId}</name>
<modules>
- <module>base</module>
+ <module>type</module>
</modules>
<dependencies>
diff --git a/agent/plugins/logging/base/pom.xml
b/agent/plugins/logging/type/base/pom.xml
similarity index 94%
rename from agent/plugins/logging/base/pom.xml
rename to agent/plugins/logging/type/base/pom.xml
index 20f3fcf904b..0fe064f6595 100644
--- a/agent/plugins/logging/base/pom.xml
+++ b/agent/plugins/logging/type/base/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-plugin-logging</artifactId>
+ <artifactId>shardingsphere-agent-logging-type</artifactId>
<version>5.3.1-SNAPSHOT</version>
</parent>
<artifactId>shardingsphere-agent-logging-base</artifactId>
<name>${project.artifactId}</name>
<properties>
- <target.directory>${project.basedir}/target/plugins</target.directory>
+
<target.directory>${project.basedir}/../target/plugins</target.directory>
</properties>
<build>
diff --git
a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
b/agent/plugins/logging/type/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
similarity index 100%
rename from
agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
rename to
agent/plugins/logging/type/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/BaseLoggingPluginBootService.java
diff --git
a/agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
b/agent/plugins/logging/type/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
similarity index 100%
rename from
agent/plugins/logging/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
rename to
agent/plugins/logging/type/base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/MetaDataContextsFactoryAdvice.java
diff --git
a/agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
b/agent/plugins/logging/type/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
similarity index 100%
rename from
agent/plugins/logging/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
rename to
agent/plugins/logging/type/base/src/main/resources/META-INF/services/org.apache.shardingsphere.agent.spi.PluginBootService
diff --git
a/agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
b/agent/plugins/logging/type/base/src/main/resources/baselogging/advisors.yaml
similarity index 100%
rename from
agent/plugins/logging/base/src/main/resources/baselogging/advisors.yaml
rename to
agent/plugins/logging/type/base/src/main/resources/baselogging/advisors.yaml
diff --git a/agent/plugins/logging/pom.xml b/agent/plugins/logging/type/pom.xml
similarity index 76%
copy from agent/plugins/logging/pom.xml
copy to agent/plugins/logging/type/pom.xml
index 1d1533c4a2b..427d72e46d7 100644
--- a/agent/plugins/logging/pom.xml
+++ b/agent/plugins/logging/type/pom.xml
@@ -21,23 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-plugins</artifactId>
+ <artifactId>shardingsphere-agent-plugin-logging</artifactId>
<version>5.3.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-agent-plugin-logging</artifactId>
+ <artifactId>shardingsphere-agent-logging-type</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<modules>
<module>base</module>
</modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-plugin-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
</project>
