Provides some much needed TLC

.gitignore

@@ -0,0 +1,55 @@
+.idea/
+*.class
+*.log
+*.ctxt
+.mtj.tmp/
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+hs_err_pid*
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+._*
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+*.stackdump
+[Dd]esktop.ini
+$RECYCLE.BIN/
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+*.lnk
+.gradle
+**/build/
+!src/**/build/
+gradle-app.setting
+!gradle-wrapper.jar
+.gradletasknamecache
+*~
+.fuse_hidden*
+.directory
+.Trash-*
+.nfs*
+release/

armitage/build.gradle

@@ -0,0 +1,45 @@
+plugins {
+    id 'java'
+}
+
+group 'armitage'
+version '1.0-SNAPSHOT'
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': 'armitage.ArmitageMain'
+    }
+    from {
+        configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+    archiveName 'armitage.jar'
+}
+
+dependencies {
+    implementation files('../lib/sleep.jar', '../lib/jgraphx.jar')
+
+    implementation group: 'org.javassist', name: 'javassist', version: '3.28.0-GA'
+    implementation group: 'org.postgresql', name: 'postgresql', version: '9.4.1212'
+    implementation group: 'org.msgpack', name: 'msgpack', version: '0.6.12'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+}
+
+test {
+    useJUnitPlatform()
+}
+
+task copyJar(type: Copy) {
+    from jar
+    into "../build"
+}
+
+assemble.finalizedBy(copyJar)

src/armitage/ArmitageApplication.java → armitage/src/main/java/armitage/ArmitageApplication.java

@@ -1,7 +1,6 @@
 package armitage;
 
 import javax.swing.*;
-import javax.swing.event.*;
 import java.awt.image.*;
 
 import java.awt.*;

src/armitage/ArmitageMain.java → armitage/src/main/java/armitage/ArmitageMain.java

@@ -1,8 +1,9 @@
 package armitage;
 
+import cortana.core.EventManager;
+import cortana.core.FilterManager;
 import sleep.runtime.*;
 import sleep.interfaces.*;
-import sleep.console.*;
 import sleep.bridges.*;
 import sleep.error.*;
 import sleep.engine.*;
@@ -11,7 +12,6 @@
 import java.util.*;
 import java.io.*;
 
-import cortana.core.*;
 import ui.*;
 
 /**

src/cortana/CortanaTabCompletion.java → armitage/src/main/java/cortana/CortanaTabCompletion.java

@@ -2,11 +2,8 @@
 
 import armitage.GenericTabCompletion;
 import console.Console;
-import msf.*;
+
 import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
 
 /* A generic class to manage reading/writing to a console. Keeps the code simpler (although the Sleep code to do this is 
    simpler than this Java code. *sigh* */

src/cortana/data/Credentials.java → armitage/src/main/java/cortana/data/Credentials.java

@@ -2,20 +2,10 @@
 
 import cortana.core.*;
 
-import armitage.ArmitageTimerClient;
-import armitage.ArmitageTimer;
-
-import graph.Route;
-
-import sleep.bridges.*;
-import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 import msf.*;
 
 public class Credentials extends ManagedData {

src/cortana/data/DataManager.java → armitage/src/main/java/cortana/data/DataManager.java

@@ -9,7 +9,6 @@
 import sleep.bridges.*;
 import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 

src/cortana/data/Hosts.java → armitage/src/main/java/cortana/data/Hosts.java

@@ -2,20 +2,10 @@
 
 import cortana.core.*;
 
-import armitage.ArmitageTimerClient;
-import armitage.ArmitageTimer;
-
-import graph.Route;
-
-import sleep.bridges.*;
-import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 import msf.*;
 
 public class Hosts extends ManagedData {

src/cortana/data/Loots.java → armitage/src/main/java/cortana/data/Loots.java

@@ -2,20 +2,10 @@
 
 import cortana.core.*;
 
-import armitage.ArmitageTimerClient;
-import armitage.ArmitageTimer;
-
-import graph.Route;
-
-import sleep.bridges.*;
-import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 import msf.*;
 
 public class Loots extends ManagedData {

src/cortana/data/Routes.java → armitage/src/main/java/cortana/data/Routes.java

@@ -2,20 +2,12 @@
 
 import cortana.core.*;
 
-import armitage.ArmitageTimerClient;
-import armitage.ArmitageTimer;
-
 import graph.Route;
 
-import sleep.bridges.*;
-import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 import msf.*;
 
 public class Routes extends ManagedData {

src/cortana/data/Services.java → armitage/src/main/java/cortana/data/Services.java

@@ -2,20 +2,10 @@
 
 import cortana.core.*;
 
-import armitage.ArmitageTimerClient;
-import armitage.ArmitageTimer;
-
-import graph.Route;
-
-import sleep.bridges.*;
-import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 import msf.*;
 
 public class Services extends ManagedData {

src/cortana/data/Sessions.java → armitage/src/main/java/cortana/data/Sessions.java

@@ -2,20 +2,10 @@
 
 import cortana.core.*;
 
-import armitage.ArmitageTimerClient;
-import armitage.ArmitageTimer;
-
-import graph.Route;
-
-import sleep.bridges.*;
-import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 import msf.*;
 
 public class Sessions extends ManagedData {

src/cortana/gui/MenuBridge.java → armitage/src/main/java/cortana/gui/MenuBridge.java

@@ -1,7 +1,5 @@
 package cortana.gui;
 
-import cortana.core.*;
-import msf.*;
 import armitage.*;
 import ui.*;
 
@@ -10,14 +8,11 @@
 import sleep.runtime.*;
 import sleep.engine.*;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 /* an API to bind new menus in Armitage */
 public class MenuBridge implements Loadable, Function, Environment {
 	protected ArmitageApplication armitage;

src/cortana/gui/MenuBuilder.java → armitage/src/main/java/cortana/gui/MenuBuilder.java

@@ -1,23 +1,15 @@
 package cortana.gui;
 
-import cortana.core.*;
-import msf.*;
 import armitage.*;
-import ui.*;
 
 import sleep.bridges.*;
 import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
-
-import java.io.IOException;
 
 /* an API to bind new menus in Armitage */
 public class MenuBuilder {

src/cortana/gui/ScriptedMenu.java → armitage/src/main/java/cortana/gui/ScriptedMenu.java

@@ -1,13 +1,9 @@
 package cortana.gui;
 
-import java.awt.*;
-import java.awt.event.*;
-
 import javax.swing.*;
 import javax.swing.event.*;
 
 import sleep.runtime.*;
-import sleep.engine.*;
 import sleep.bridges.*;
 
 import java.util.*;

src/cortana/gui/ScriptedMenuItem.java → armitage/src/main/java/cortana/gui/ScriptedMenuItem.java

@@ -3,7 +3,6 @@
 import sleep.runtime.*;
 import sleep.bridges.*;
 
-import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;

src/cortana/gui/UIBridge.java → armitage/src/main/java/cortana/gui/UIBridge.java

@@ -1,23 +1,16 @@
 package cortana.gui;
 
 import cortana.core.*;
-import msf.*;
 import armitage.*;
-import ui.*;
 
 import sleep.bridges.*;
 import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
-import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 /* some methods to help out with user interface stuff */
 public class UIBridge implements Loadable, Function {
 	protected ArmitageApplication armitage;

src/cortana/metasploit/ConsoleBridge.java → armitage/src/main/java/cortana/metasploit/ConsoleBridge.java

@@ -8,14 +8,9 @@
 import sleep.bridges.*;
 import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
-import javax.swing.*;
-
 public class ConsoleBridge implements Loadable, Function, ConsoleQueue.ConsoleCallback {
 	protected EventManager  events;
 	protected FilterManager filters;

src/cortana/metasploit/EventLogBridge.java → armitage/src/main/java/cortana/metasploit/EventLogBridge.java

@@ -7,12 +7,9 @@
 import sleep.bridges.*;
 import sleep.interfaces.*;
 import sleep.runtime.*;
-import sleep.engine.*;
 
 import java.util.*;
 
-import java.io.IOException;
-
 /* add an API for interfacing with the event log... */
 public class EventLogBridge implements Loadable, Function, ConsoleCallback {
 	protected EventManager  events;