rename swing packages, create executible jar

gumshoe-tools/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>gumshoe-probes</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.dell</groupId>
+            <artifactId>gumshoe-hooks</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -43,6 +48,30 @@
                     </includes>
                 </configuration>
             </plugin>
+            <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-assembly-plugin</artifactId>
+		        <executions>
+		            <execution>
+		                <goals>
+		                    <goal>attached</goal>
+		                </goals>
+		                <phase>package</phase>
+		                <configuration>
+		                    <descriptorRefs>
+		                        <descriptorRef>jar-with-dependencies</descriptorRef>
+		                    </descriptorRefs>
+		                    <archive>
+		                        <manifest>
+		                            <mainClass>com.dell.gumshoe.inspector.Inspector</mainClass>
+		                        </manifest>
+		                    </archive>
+                            <finalName>inspector</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+		                </configuration>
+		            </execution>
+		        </executions>
+		    </plugin>
         </plugins>
     </build>
 

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/FileDataParser.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/FileDataParser.java

@@ -1,9 +1,9 @@
-package com.dell.gumshoe.tools;
+package com.dell.gumshoe.inspector;
 
+import com.dell.gumshoe.inspector.helper.DataTypeHelper;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;
 import com.dell.gumshoe.stats.ValueReporter;
-import com.dell.gumshoe.tools.stats.DataTypeHelper;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/FileSourcePanel.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/FileSourcePanel.java

@@ -1,6 +1,6 @@
-package com.dell.gumshoe.tools;
+package com.dell.gumshoe.inspector;
 
-import static com.dell.gumshoe.tools.Swing.flow;
+import static com.dell.gumshoe.util.Swing.flow;
 
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/FilterEditor.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/FilterEditor.java

@@ -1,16 +1,16 @@
-package com.dell.gumshoe.tools;
+package com.dell.gumshoe.inspector;
 
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.rows;
-import static com.dell.gumshoe.tools.Swing.stackNorth;
-import static com.dell.gumshoe.tools.Swing.titled;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.rows;
+import static com.dell.gumshoe.util.Swing.stackNorth;
+import static com.dell.gumshoe.util.Swing.titled;
 
+import com.dell.gumshoe.inspector.graph.StackGraphPanel;
 import com.dell.gumshoe.stack.MinutiaFilter;
 import com.dell.gumshoe.stack.StackFilter;
 import com.dell.gumshoe.stack.StandardFilter;
 import com.dell.gumshoe.stack.StandardFilter.Builder;
-import com.dell.gumshoe.tools.graph.StackGraphPanel;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/Gumshoe.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/Inspector.java

@@ -1,11 +1,13 @@
-package com.dell.gumshoe.tools;
+package com.dell.gumshoe.inspector;
 
 import com.dell.gumshoe.ProbeManager;
+import com.dell.gumshoe.inspector.StatisticsSourcePanel.Listener;
+import com.dell.gumshoe.inspector.graph.StackGraphPanel;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;
-import com.dell.gumshoe.tools.StatisticsSourcePanel.Listener;
-import com.dell.gumshoe.tools.graph.StackGraphPanel;
-import static com.dell.gumshoe.tools.Swing.*;
+
+import static com.dell.gumshoe.util.Swing.*;
+
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -31,7 +33,7 @@
  *  first argument is the name of the target main class to run,
  *  remaining arguments are passed as the args to that main.
  */
-public class Gumshoe extends JPanel {
+public class Inspector extends JPanel {
     public static void main(String[] args) throws Throwable {
         final boolean hasMain = args.length>0;
         launchGumshoe(hasMain);
@@ -57,7 +59,7 @@ private static void launchGumshoe(boolean hasMain) throws Exception {
         final ProbeManager probe = useProbe ? new ProbeManager() : null;
         if(useProbe) { probe.initialize(); }
 
-        final Gumshoe gui = new Gumshoe(probe, hasMain);
+        final Inspector gui = new Inspector(probe, hasMain);
         gui.setVisible(true);
     }
 
@@ -84,11 +86,11 @@ private static void launchMain(String mainClassName, String[] args) throws Throw
 
     private final JFrame frame = new JFrame();
 
-    public Gumshoe() {
+    public Inspector() {
         this(null, false);
     }
 
-    private Gumshoe(ProbeManager probe, boolean hasMain) {
+    private Inspector(ProbeManager probe, boolean hasMain) {
         final StackGraphPanel graph = new StackGraphPanel();
 
         final StatisticsSourcePanel statsRelay = new StatisticsSourcePanel(probe);

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/OptionEditor.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/OptionEditor.java

@@ -1,15 +1,15 @@
-package com.dell.gumshoe.tools;
-
-import static com.dell.gumshoe.tools.Swing.columns;
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.stackNorth;
-import static com.dell.gumshoe.tools.Swing.stackSouth;
-import static com.dell.gumshoe.tools.Swing.stackWest;
-import static com.dell.gumshoe.tools.Swing.titled;
-
-import com.dell.gumshoe.tools.graph.DisplayOptions;
-import com.dell.gumshoe.tools.stats.DataTypeHelper;
+package com.dell.gumshoe.inspector;
+
+import static com.dell.gumshoe.util.Swing.columns;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.stackNorth;
+import static com.dell.gumshoe.util.Swing.stackSouth;
+import static com.dell.gumshoe.util.Swing.stackWest;
+import static com.dell.gumshoe.util.Swing.titled;
+
+import com.dell.gumshoe.inspector.graph.DisplayOptions;
+import com.dell.gumshoe.inspector.helper.DataTypeHelper;
 
 import javax.swing.BorderFactory;
 import javax.swing.JButton;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/ProbeSourcePanel.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/ProbeSourcePanel.java

@@ -1,14 +1,14 @@
-package com.dell.gumshoe.tools;
+package com.dell.gumshoe.inspector;
 
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.rows;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.rows;
 
 import com.dell.gumshoe.ProbeManager;
+import com.dell.gumshoe.inspector.helper.DataTypeHelper;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;
 import com.dell.gumshoe.stats.ValueReporter.Listener;
-import com.dell.gumshoe.tools.stats.DataTypeHelper;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/StatisticsSourcePanel.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/StatisticsSourcePanel.java

@@ -1,7 +1,7 @@
-package com.dell.gumshoe.tools;
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.stackNorth;
+package com.dell.gumshoe.inspector;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.stackNorth;
 
 import com.dell.gumshoe.ProbeManager;
 import com.dell.gumshoe.stack.Stack;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/graph/Box.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/graph/Box.java

@@ -1,6 +1,6 @@
-package com.dell.gumshoe.tools.graph;
+package com.dell.gumshoe.inspector.graph;
 
-import com.dell.gumshoe.tools.stats.DataTypeHelper;
+import com.dell.gumshoe.inspector.helper.DataTypeHelper;
 
 import java.awt.Color;
 import java.awt.Graphics;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/graph/DisplayOptions.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/graph/DisplayOptions.java

@@ -1,4 +1,4 @@
-package com.dell.gumshoe.tools.graph;
+package com.dell.gumshoe.inspector.graph;
 
 
 /** configurable aspects of rendering frames and boxes */

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/graph/StackFrameNode.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/graph/StackFrameNode.java

@@ -1,9 +1,9 @@
-package com.dell.gumshoe.tools.graph;
+package com.dell.gumshoe.inspector.graph;
 
+import com.dell.gumshoe.inspector.helper.DataTypeHelper;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stack.StackFilter;
 import com.dell.gumshoe.stats.StatisticAdder;
-import com.dell.gumshoe.tools.stats.DataTypeHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/graph/StackGraphPanel.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/graph/StackGraphPanel.java

@@ -1,10 +1,10 @@
-package com.dell.gumshoe.tools.graph;
+package com.dell.gumshoe.inspector.graph;
 
+import com.dell.gumshoe.inspector.OptionEditor;
+import com.dell.gumshoe.inspector.helper.DataTypeHelper;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stack.StackFilter;
 import com.dell.gumshoe.stats.StatisticAdder;
-import com.dell.gumshoe.tools.OptionEditor;
-import com.dell.gumshoe.tools.stats.DataTypeHelper;
 
 import javax.swing.JComponent;
 import javax.swing.JPanel;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/CPUUsageHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/CPUUsageHelper.java

@@ -1,18 +1,18 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.grid;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.rows;
-import static com.dell.gumshoe.tools.Swing.stackNorth;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.grid;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.rows;
+import static com.dell.gumshoe.util.Swing.stackNorth;
 
 import com.dell.gumshoe.ProbeManager;
+import com.dell.gumshoe.inspector.graph.StackFrameNode;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;
 import com.dell.gumshoe.stats.ValueReporter;
 import com.dell.gumshoe.stats.ValueReporter.Listener;
 import com.dell.gumshoe.thread.CPUStats;
-import com.dell.gumshoe.tools.graph.StackFrameNode;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/DataTypeHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/DataTypeHelper.java

@@ -1,12 +1,12 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
-import static com.dell.gumshoe.tools.Swing.flow;
+import static com.dell.gumshoe.util.Swing.flow;
 
 import com.dell.gumshoe.ProbeManager;
+import com.dell.gumshoe.inspector.graph.StackFrameNode;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;
 import com.dell.gumshoe.stats.ValueReporter.Listener;
-import com.dell.gumshoe.tools.graph.StackFrameNode;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/DatagramIOHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/DatagramIOHelper.java

@@ -1,4 +1,4 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
 import com.dell.gumshoe.ProbeManager;
 import com.dell.gumshoe.network.DatagramIODetailAdder;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/FileIOHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/FileIOHelper.java

@@ -1,4 +1,4 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
 import com.dell.gumshoe.ProbeManager;
 import com.dell.gumshoe.file.FileIODetailAdder;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/IOHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/IOHelper.java

@@ -1,15 +1,15 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
-import static com.dell.gumshoe.tools.Swing.columns;
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.stackNorth;
+import static com.dell.gumshoe.util.Swing.columns;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.stackNorth;
 
 import com.dell.gumshoe.file.FileIODetailAdder;
+import com.dell.gumshoe.inspector.graph.StackFrameNode;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.IODetailAdder;
 import com.dell.gumshoe.stats.StatisticAdder;
-import com.dell.gumshoe.tools.graph.StackFrameNode;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/SocketIOHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/SocketIOHelper.java

@@ -1,4 +1,4 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
 import com.dell.gumshoe.ProbeManager;
 import com.dell.gumshoe.network.SocketIODetailAdder;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/stats/UnclosedSocketHelper.java → gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/helper/UnclosedSocketHelper.java

@@ -1,16 +1,16 @@
-package com.dell.gumshoe.tools.stats;
+package com.dell.gumshoe.inspector.helper;
 
-import static com.dell.gumshoe.tools.Swing.flow;
-import static com.dell.gumshoe.tools.Swing.groupButtons;
-import static com.dell.gumshoe.tools.Swing.stackNorth;
+import static com.dell.gumshoe.util.Swing.flow;
+import static com.dell.gumshoe.util.Swing.groupButtons;
+import static com.dell.gumshoe.util.Swing.stackNorth;
 
 import com.dell.gumshoe.ProbeManager;
+import com.dell.gumshoe.inspector.graph.StackFrameNode;
 import com.dell.gumshoe.network.UnclosedStats;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;
 import com.dell.gumshoe.stats.ValueReporter;
 import com.dell.gumshoe.stats.ValueReporter.Listener;
-import com.dell.gumshoe.tools.graph.StackFrameNode;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;

gumshoe-tools/src/main/java/com/dell/gumshoe/tools/Swing.java → gumshoe-tools/src/main/java/com/dell/gumshoe/util/Swing.java

@@ -1,4 +1,4 @@
-package com.dell.gumshoe.tools;
+package com.dell.gumshoe.util;
 
 import javax.accessibility.AccessibleContext;
 import javax.swing.AbstractButton;

gumshoe-tools/src/test/java/com/dell/gumshoe/tools/TestFileReader.java

@@ -1,5 +1,6 @@
 package com.dell.gumshoe.tools;
 
+import com.dell.gumshoe.inspector.FileDataParser;
 import com.dell.gumshoe.stack.Stack;
 import com.dell.gumshoe.stats.StatisticAdder;