move abstractsystemplugin

PerfMa · Nov 1, 2021 · d2d803e · d2d803e
1 parent 3b387f6
commit d2d803e
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 7 deletions.
diff --git a/...t/command/impl/AbstractSystemCommand.java → ...pocket/command/AbstractSystemCommand.java b/...t/command/impl/AbstractSystemCommand.java → ...pocket/command/AbstractSystemCommand.java
@@ -1,4 +1,4 @@
-package com.perfma.xlab.xpocket.command.impl;
+package com.perfma.xlab.xpocket.command;
 
 import com.perfma.xlab.xpocket.spi.command.AbstractXPocketCommand;
 import org.jline.reader.impl.LineReaderImpl;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/AttachCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/AttachCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.context.SessionContext;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/CdCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/CdCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.impl.XPocketStatusContext;
 import com.perfma.xlab.xpocket.plugin.manager.PluginManager;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ClearCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ClearCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/DetachCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/DetachCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.command.XPocketProcessTemplate;
 import com.perfma.xlab.xpocket.spi.context.SessionContext;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/EchoCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/EchoCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/GrepCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/GrepCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/HelpCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/HelpCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.impl.XPocketStatusContext;
 import com.perfma.xlab.xpocket.plugin.context.FrameworkPluginContext;
 import com.perfma.xlab.xpocket.plugin.manager.CommandManager;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/HistoryCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/HistoryCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 import org.jline.reader.History;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/JPSCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/JPSCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.localjvm.JvmPid;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/KillCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/KillCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.command.XPocketProcessTemplate;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ListPluginsCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ListPluginsCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.plugin.context.FrameworkPluginContext;
 import com.perfma.xlab.xpocket.plugin.manager.CommandManager;
 import com.perfma.xlab.xpocket.plugin.manager.PluginManager;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcDeleteCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcDeleteCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.impl.CommandProcessor;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcExecCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcExecCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.execution.pipeline.DefaultProcessInfo;
 import com.perfma.xlab.xpocket.framework.spi.impl.CommandProcessor;
 import com.perfma.xlab.xpocket.plugin.manager.ExecutionManager;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcListCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcListCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.impl.CommandProcessor;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcSaveCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/ProcSaveCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.execution.pipeline.DefaultProcessInfo;
 import com.perfma.xlab.xpocket.framework.spi.execution.pipeline.DefaultXPocketProcess;
 import com.perfma.xlab.xpocket.framework.spi.impl.CommandProcessor;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/QuitCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/QuitCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.console.EndOfInputException;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/SessionCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/SessionCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.impl.XPocketStatusContext;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/SplitCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/SplitCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/SysCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/SysCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 import com.perfma.xlab.xpocket.utils.TerminalUtil;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/TTopCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/TTopCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.command.XPocketProcessTemplate;
 import com.perfma.xlab.xpocket.spi.command.callback.SimpleProcessCallback;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/TopCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/TopCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 import org.jline.keymap.BindingReader;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/TrimCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/TrimCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/UseCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/UseCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.framework.spi.impl.XPocketStatusContext;
 import com.perfma.xlab.xpocket.plugin.context.FrameworkPluginContext;
 import com.perfma.xlab.xpocket.plugin.manager.PluginManager;

diff --git a/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/VersionCommand.java b/xpocket-runtime/src/main/java/com/perfma/xlab/xpocket/command/impl/VersionCommand.java
@@ -1,5 +1,6 @@
 package com.perfma.xlab.xpocket.command.impl;
 
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.spi.command.CommandInfo;
 import com.perfma.xlab.xpocket.spi.process.XPocketProcess;
 import com.perfma.xlab.xpocket.utils.XPocketConstants;

diff --git a/...ket-runtime/src/main/java/com/perfma/xlab/xpocket/framework/spi/impl/DefaultUIEngine.java b/...ket-runtime/src/main/java/com/perfma/xlab/xpocket/framework/spi/impl/DefaultUIEngine.java
@@ -1,6 +1,6 @@
 package com.perfma.xlab.xpocket.framework.spi.impl;
 
-import com.perfma.xlab.xpocket.command.impl.AbstractSystemCommand;
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.completer.CommandCompleter;
 import com.perfma.xlab.xpocket.completer.GroupStringCompleter;
 import com.perfma.xlab.xpocket.completer.ParamsCompleter;
@@ -241,6 +241,7 @@ private DefaultPluginContext initSystemPlugin() {
         sysPluginContext.setTips(tips);
 
         HashMap<String, DefaultCommandContext> cmdMap = new HashMap<>();
+
         for (String cmd : XPocketConstants.XPOCKET_COMMANDS) {
             try {
                 Class pluginClass = Class.forName(XPocketConstants.XPOCKET_COMMAND_PACKAGE + cmd

diff --git a/...src/main/java/com/perfma/xlab/xpocket/framework/spi/impl/agent/AgentPluginLoaderImpl.java b/...src/main/java/com/perfma/xlab/xpocket/framework/spi/impl/agent/AgentPluginLoaderImpl.java
@@ -18,7 +18,6 @@
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.InputStreamReader;
-import java.io.PrintStream;
 import java.lang.instrument.Instrumentation;
 import java.net.URL;
 import java.nio.charset.Charset;

diff --git a/...main/java/com/perfma/xlab/xpocket/framework/spi/impl/agent/XPocketAgentShellProvider.java b/...main/java/com/perfma/xlab/xpocket/framework/spi/impl/agent/XPocketAgentShellProvider.java
@@ -1,6 +1,6 @@
 package com.perfma.xlab.xpocket.framework.spi.impl.agent;
 
-import com.perfma.xlab.xpocket.command.impl.AbstractSystemCommand;
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.completer.CommandCompleter;
 import com.perfma.xlab.xpocket.completer.GroupStringCompleter;
 import com.perfma.xlab.xpocket.completer.ParamsCompleter;

diff --git a/.../main/java/com/perfma/xlab/xpocket/framework/spi/impl/once/OnceExecutionUIEngineImpl.java b/.../main/java/com/perfma/xlab/xpocket/framework/spi/impl/once/OnceExecutionUIEngineImpl.java
@@ -1,6 +1,6 @@
 package com.perfma.xlab.xpocket.framework.spi.impl.once;
 
-import com.perfma.xlab.xpocket.command.impl.AbstractSystemCommand;
+import com.perfma.xlab.xpocket.command.AbstractSystemCommand;
 import com.perfma.xlab.xpocket.console.EndOfInputException;
 import com.perfma.xlab.xpocket.framework.spi.execution.pipeline.DefaultNode;
 import com.perfma.xlab.xpocket.framework.spi.execution.pipeline.DefaultProcessInfo;

diff --git a/...runtime/src/main/java/com/perfma/xlab/xpocket/plugin/adaptor/JavaAgentCommandAdaptor.java b/...runtime/src/main/java/com/perfma/xlab/xpocket/plugin/adaptor/JavaAgentCommandAdaptor.java
@@ -142,7 +142,7 @@ public void run() {
         try {
             int ret_read = 0, index = 0;
             char[] line = new char[1024];
-            boolean print = false;
+            boolean print = false,firstLine = false;
             LOOP:
             for (;;) {
                 ret_read = instr.read();
@@ -156,19 +156,25 @@ public void run() {
                 }
 
                 switch (ret_read) {
+                    case '\r':
                     case '\n':
                         String lineStr = new String(line, 0, index);
                         if (!lineStr.trim().equalsIgnoreCase(process.getCmd()) 
                                 && print) {
                             process.output(lineStr + "\n");
                         }
+                        if(firstLine) {
+                            print = true;
+                            firstLine = false;
+                        }
                         index = 0;
                         break;
                     case '>':
                         line = put(line, index++, (char) ret_read);
                         String flag = new String(line, 0, index);
                         if (flag.contains("XPocket [")) {
-                            print = true;
+                            firstLine = true;
+                            print = false;
                             process.end();
                             process = null;
                             index = 0;