From 1b81e00b5667aa3fd059980dedd5cd28c027cd76 Mon Sep 17 00:00:00 2001
From: yanrongzhen <bruceyan@didiglobal.com>
Date: Wed, 24 May 2023 11:01:36 +0800
Subject: [PATCH] fix agent dist package (#1324)

---
 .../{mode/config => }/apollo-plugin/pom.xml    |  4 ++--
 .../apollo/boot/ApolloPluginBootService.java   |  0
 .../apollo/define/ApolloInstrumentation.java   |  0
 .../DefaultConfigConstructorInterceptor.java   |  0
 .../cn.hippo4j.agent.core.boot.BootService     |  0
 .../src/main/resources/hippo4j-plugin.def      |  0
 agent/hippo4j-agent-plugin/mode/config/pom.xml | 18 ------------------
 agent/hippo4j-agent-plugin/mode/pom.xml        | 18 ------------------
 agent/hippo4j-agent-plugin/pom.xml             |  2 +-
 9 files changed, 3 insertions(+), 39 deletions(-)
 rename agent/hippo4j-agent-plugin/{mode/config => }/apollo-plugin/pom.xml (85%)
 rename agent/hippo4j-agent-plugin/{mode/config => }/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/boot/ApolloPluginBootService.java (100%)
 rename agent/hippo4j-agent-plugin/{mode/config => }/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/define/ApolloInstrumentation.java (100%)
 rename agent/hippo4j-agent-plugin/{mode/config => }/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/interceptor/DefaultConfigConstructorInterceptor.java (100%)
 rename agent/hippo4j-agent-plugin/{mode/config => }/apollo-plugin/src/main/resources/META-INF/services/cn.hippo4j.agent.core.boot.BootService (100%)
 rename agent/hippo4j-agent-plugin/{mode/config => }/apollo-plugin/src/main/resources/hippo4j-plugin.def (100%)
 delete mode 100644 agent/hippo4j-agent-plugin/mode/config/pom.xml
 delete mode 100644 agent/hippo4j-agent-plugin/mode/pom.xml

diff --git a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/pom.xml b/agent/hippo4j-agent-plugin/apollo-plugin/pom.xml
similarity index 85%
rename from agent/hippo4j-agent-plugin/mode/config/apollo-plugin/pom.xml
rename to agent/hippo4j-agent-plugin/apollo-plugin/pom.xml
index f1cce5e5..90f71b3d 100644
--- a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/pom.xml
+++ b/agent/hippo4j-agent-plugin/apollo-plugin/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cn.hippo4j</groupId>
-        <artifactId>hippo4j-agent-config-mode</artifactId>
+        <artifactId>hippo4j-agent-plugin</artifactId>
         <version>${revision}</version>
     </parent>
 
-    <artifactId>hippo4j-agent-config-apollo-plugin</artifactId>
+    <artifactId>hippo4j-agent-apollo-plugin</artifactId>
 
     <properties>
         <apollo.version>1.9.1</apollo.version>
diff --git a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/boot/ApolloPluginBootService.java b/agent/hippo4j-agent-plugin/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/boot/ApolloPluginBootService.java
similarity index 100%
rename from agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/boot/ApolloPluginBootService.java
rename to agent/hippo4j-agent-plugin/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/boot/ApolloPluginBootService.java
diff --git a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/define/ApolloInstrumentation.java b/agent/hippo4j-agent-plugin/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/define/ApolloInstrumentation.java
similarity index 100%
rename from agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/define/ApolloInstrumentation.java
rename to agent/hippo4j-agent-plugin/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/define/ApolloInstrumentation.java
diff --git a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/interceptor/DefaultConfigConstructorInterceptor.java b/agent/hippo4j-agent-plugin/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/interceptor/DefaultConfigConstructorInterceptor.java
similarity index 100%
rename from agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/interceptor/DefaultConfigConstructorInterceptor.java
rename to agent/hippo4j-agent-plugin/apollo-plugin/src/main/java/cn/hippo4j/agent/plugin/apollo/interceptor/DefaultConfigConstructorInterceptor.java
diff --git a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/resources/META-INF/services/cn.hippo4j.agent.core.boot.BootService b/agent/hippo4j-agent-plugin/apollo-plugin/src/main/resources/META-INF/services/cn.hippo4j.agent.core.boot.BootService
similarity index 100%
rename from agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/resources/META-INF/services/cn.hippo4j.agent.core.boot.BootService
rename to agent/hippo4j-agent-plugin/apollo-plugin/src/main/resources/META-INF/services/cn.hippo4j.agent.core.boot.BootService
diff --git a/agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/resources/hippo4j-plugin.def b/agent/hippo4j-agent-plugin/apollo-plugin/src/main/resources/hippo4j-plugin.def
similarity index 100%
rename from agent/hippo4j-agent-plugin/mode/config/apollo-plugin/src/main/resources/hippo4j-plugin.def
rename to agent/hippo4j-agent-plugin/apollo-plugin/src/main/resources/hippo4j-plugin.def
diff --git a/agent/hippo4j-agent-plugin/mode/config/pom.xml b/agent/hippo4j-agent-plugin/mode/config/pom.xml
deleted file mode 100644
index d0414050..00000000
--- a/agent/hippo4j-agent-plugin/mode/config/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.hippo4j</groupId>
-        <artifactId>hippo4j-agent-mode</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>hippo4j-agent-config-mode</artifactId>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>apollo-plugin</module>
-    </modules>
-</project>
\ No newline at end of file
diff --git a/agent/hippo4j-agent-plugin/mode/pom.xml b/agent/hippo4j-agent-plugin/mode/pom.xml
deleted file mode 100644
index 39a427e5..00000000
--- a/agent/hippo4j-agent-plugin/mode/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.hippo4j</groupId>
-        <artifactId>hippo4j-agent-plugin</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>hippo4j-agent-mode</artifactId>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>config</module>
-    </modules>
-</project>
\ No newline at end of file
diff --git a/agent/hippo4j-agent-plugin/pom.xml b/agent/hippo4j-agent-plugin/pom.xml
index c7312efb..4a3f7954 100644
--- a/agent/hippo4j-agent-plugin/pom.xml
+++ b/agent/hippo4j-agent-plugin/pom.xml
@@ -14,8 +14,8 @@
     <modules>
         <module>spring-plugins</module>
         <module>threadpool-plugin</module>
-        <module>mode</module>
         <module>adapter-plugins</module>
+        <module>apollo-plugin</module>
     </modules>
 
     <properties>