move plugin to a single module. #558

agent/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>arthas-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.taobao.arthas</groupId>
+            <artifactId>arthas-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.taobao.arthas</groupId>
             <artifactId>arthas-bytekit</artifactId>

agent/src/main/java/com/taobao/arthas/agent/ArthasAgent.java

@@ -9,9 +9,9 @@ import java.util.Properties;
 
 import com.alibaba.arthas.deps.org.slf4j.Logger;
 import com.alibaba.arthas.deps.org.slf4j.LoggerFactory;
+import com.alibaba.arthas.plugin.PluginException;
+import com.alibaba.arthas.plugin.PluginManager;
 import com.taobao.arthas.common.FeatureCodec;
-import com.taobao.arthas.plugin.PluginException;
-import com.taobao.arthas.plugin.PluginManager;
 
 /**
  *

agent/src/test/java/com/taobao/arthas/agent/PluginConfigTest.java

@@ -5,8 +5,8 @@ import java.util.Properties;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.alibaba.arthas.plugin.PluginConfig;
 import com.taobao.arthas.common.properties.PropertiesInjectUtil;
-import com.taobao.arthas.plugin.PluginConfig;
 
 public class PluginConfigTest {
 

apm-demo/src/main/java/com/taobao/arthas/demo/plugin/DemoPluginActivator.java

@@ -11,14 +11,14 @@ import org.slf4j.LoggerFactory;
 
 import com.alibaba.arthas.deps.org.objectweb.asm.tree.ClassNode;
 import com.alibaba.arthas.deps.org.objectweb.asm.tree.MethodNode;
+import com.alibaba.arthas.plugin.Plugin;
+import com.alibaba.arthas.plugin.PluginActivator;
+import com.alibaba.arthas.plugin.PluginContext;
 import com.taobao.arthas.bytekit.asm.MethodProcessor;
 import com.taobao.arthas.bytekit.asm.interceptor.InterceptorProcessor;
 import com.taobao.arthas.bytekit.asm.interceptor.parser.DefaultInterceptorClassParser;
 import com.taobao.arthas.bytekit.utils.AsmUtils;
 import com.taobao.arthas.bytekit.utils.MatchUtils;
-import com.taobao.arthas.plugin.Plugin;
-import com.taobao.arthas.plugin.PluginActivator;
-import com.taobao.arthas.plugin.PluginContext;
 
 public class DemoPluginActivator implements PluginActivator {
 

core/src/main/java/com/taobao/arthas/core/CorePluginActivator.java

@@ -5,12 +5,12 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.util.jar.JarFile;
 
+import com.alibaba.arthas.plugin.PluginActivator;
+import com.alibaba.arthas.plugin.PluginContext;
 import com.taobao.arthas.common.PidUtils;
 import com.taobao.arthas.core.advisor.AdviceWeaver;
 import com.taobao.arthas.core.config.Configure;
 import com.taobao.arthas.core.server.ArthasBootstrap;
-import com.taobao.arthas.plugin.PluginActivator;
-import com.taobao.arthas.plugin.PluginContext;
 
 /**
  *

core/src/main/java/com/taobao/arthas/core/command/basic1000/PluginsCommand.java

@@ -2,12 +2,12 @@ package com.taobao.arthas.core.command.basic1000;
 
 import static com.taobao.text.ui.Element.label;
 
+import com.alibaba.arthas.plugin.Plugin;
+import com.alibaba.arthas.plugin.PluginManager;
 import com.taobao.arthas.agent.ArthasAgent;
 import com.taobao.arthas.core.shell.command.AnnotatedCommand;
 import com.taobao.arthas.core.shell.command.CommandProcess;
 import com.taobao.arthas.core.util.LogUtil;
-import com.taobao.arthas.plugin.Plugin;
-import com.taobao.arthas.plugin.PluginManager;
 import com.taobao.middleware.cli.annotations.Description;
 import com.taobao.middleware.cli.annotations.Name;
 import com.taobao.middleware.cli.annotations.Option;

plugin/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<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>com.taobao.arthas</groupId>
+		<artifactId>arthas-all</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>arthas-plugin</artifactId>
+	<name>arthas-plugin</name>
+
+	<dependencies>
+        <dependency>
+            <groupId>com.taobao.arthas</groupId>
+            <artifactId>arthas-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.arthas</groupId>
+            <artifactId>arthas-repackage-logger</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+	</dependencies>
+	<build>
+		<finalName>arthas-plugin</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+					<encoding>UTF-8</encoding>
+					<showDeprecation>true</showDeprecation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

plugin/src/main/java/com/alibaba/arthas/plugin/ArthasPlugin.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 import java.io.File;
 import java.io.FileInputStream;

plugin/src/main/java/com/alibaba/arthas/plugin/PlguinClassLoader.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 import java.net.URL;
 import java.net.URLClassLoader;

plugin/src/main/java/com/alibaba/arthas/plugin/Plugin.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 import java.net.URL;
 

plugin/src/main/java/com/alibaba/arthas/plugin/PluginActivator.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 public interface PluginActivator {
 

plugin/src/main/java/com/alibaba/arthas/plugin/PluginConfig.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 /**
  *

plugin/src/main/java/com/alibaba/arthas/plugin/PluginContext.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 import java.lang.instrument.Instrumentation;
 

plugin/src/main/java/com/alibaba/arthas/plugin/PluginContextImpl.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 import java.lang.instrument.Instrumentation;
 import java.util.Properties;

plugin/src/main/java/com/alibaba/arthas/plugin/PluginException.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 /**
  *

plugin/src/main/java/com/alibaba/arthas/plugin/PluginManager.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 import java.io.File;
 import java.lang.instrument.Instrumentation;

plugin/src/main/java/com/alibaba/arthas/plugin/PluginState.java

@@ -1,4 +1,4 @@
-package com.taobao.arthas.plugin;
+package com.alibaba.arthas.plugin;
 
 /**
  * TODO 要有一个状态流转图 , 插件有 online /offline 状态？？比如拦截流量的，可以打开一段时间，然后再关掉

pom.xml

@@ -60,6 +60,7 @@
         <module>spy</module>
         <module>common</module>
         <module>bytekit</module>
+        <module>plugin</module>
         <module>core</module>
         <module>agent</module>
         <module>client</module>