Merge remote-tracking branch 'origin/master'

# Conflicts:
#	SharkMessenger/makeSharkNetMessengerUIJar.sh

Author: cemreozen

SharkMessenger/makeSharkNetMessengerUIJar.sh

@@ -200,7 +200,7 @@ public SharkPKIComponent getSharkPKI() {
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////
-    //                                     act on received messages                            //
+    //                                 act on received asap messages                           //
     /////////////////////////////////////////////////////////////////////////////////////////////
 
     @Override

src/net/sharksystem/app/messenger/SharkNetMessengerComponentImpl.java

@@ -49,12 +49,15 @@ public class ProductionUI {
 
     public static void main(String[] args) throws SharkException, IOException {
         ProductionUI cli = new ProductionUI(args);
-        cli.startCLI();
+        String peerName = "no peer name defined as parameter";
+        if(args != null && args.length > 0) peerName = args[0];
+        cli.startCLI(peerName);
     }
 
-    public void startCLI() {
+    public void startCLI(String peerName) {
         System.out.println("type 'help' to see the list of commands");
         smUI.runCommandLoop();
+        System.out.println("end CLI for " + peerName);
     }
 
     public ProductionUI(String[] args) throws SharkException, IOException {
@@ -151,6 +154,7 @@ public ProductionUI(String[] args) throws SharkException, IOException {
         smUI.addCommand(new UICommandScriptRQ(snmTestSupport, smUI, "scriptRQ", false));
         smUI.addCommand(new UICommandRelease(snmTestSupport, smUI, TestLanguageCompiler.CLI_RELEASE, false));
         smUI.addCommand(new UICommandOrchestrateTest(snmTestSupport, smUI, "orchestrateTest", false));
+        smUI.addCommand(new UICommandTimeBomb(snmTestSupport, smUI, TestLanguageCompiler.CLI_TIME_BOMB, false));
 
         smUI.addCommand(new UICommandSaveLog(sharkMessengerApp, smUI, "saveLog", false));
         smUI.addCommand(new UICommandShowLog(sharkMessengerApp, smUI, "showLog", false));

src/net/sharksystem/ui/messenger/cli/ProductionUI.java

@@ -25,21 +25,17 @@ public void run() {
         }
         else if(uri.toString().equalsIgnoreCase(
                 SharkNetMessengerAppSupportingDistributedTesting.SCRIPT_RQ_CHANNEL.toString())) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    SNMDistributedTestsMessageReceivedListener.this.sharkMessengerAppTestingVersion.
-                            scriptRQReceived(SharkNetMessengerAppSupportingDistributedTesting.SCRIPT_RQ_CHANNEL);
-                }
-            }).start();
+            // no need for a thread - is already created in asap core
+            SNMDistributedTestsMessageReceivedListener.this.sharkMessengerAppTestingVersion.
+                    receivedScriptRQ(SharkNetMessengerAppSupportingDistributedTesting.SCRIPT_RQ_CHANNEL);
         }
         else if(uri.toString().equalsIgnoreCase(
                 SharkNetMessengerAppSupportingDistributedTesting.TEST_SCRIPT_CHANNEL.toString())) {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
                     SNMDistributedTestsMessageReceivedListener.this.sharkMessengerAppTestingVersion.
-                            testScriptReceived(SharkNetMessengerAppSupportingDistributedTesting.TEST_SCRIPT_CHANNEL);
+                            receivedTestScript(SharkNetMessengerAppSupportingDistributedTesting.TEST_SCRIPT_CHANNEL);
                 }
             }).start();
         }

src/net/sharksystem/ui/messenger/cli/SNMDistributedTestsMessageReceivedListener.java

@@ -17,7 +17,9 @@ public UICommandExit(SharkNetMessengerApp sharkMessengerApp, SharkNetMessengerUI
     @Override
     public void execute() throws Exception {
         //this.printTODOReimplement();
-        System.exit(1);
+        this.getSharkMessengerApp().tellUI("end CLI for peer " +
+            this.getSharkMessengerApp().getSharkPeer().getPeerID());
+        System.exit(0);
     }
 
     @Override

src/net/sharksystem/ui/messenger/cli/SharkNetMessengerAppSupportingDistributedTesting.java

@@ -117,6 +117,7 @@ public void execute() throws Exception {
             // send message
             messenger.sendSharkMessage(effectiveFormat,
                     contentBytes, channelURI, receiverID, this.sign, this.encrypt);
+            this.getSharkMessengerApp().tellUI("message sent");
         } catch (SharkException | IOException e) {
             this.getSharkMessengerApp().tellUIError(e.getLocalizedMessage());
         }

src/net/sharksystem/ui/messenger/cli/commands/basics/UICommandExit.java

@@ -62,6 +62,8 @@ protected UICommandQuestionnaire specifyCommandStructure() {
     protected void execute() throws Exception {
         try {
             this.getSharkMessengerApp().connectTCP(this.hostName.getValue(), this.portNumber.getValue());
+            this.getSharkMessengerApp().tellUI("connected to "
+                    + this.hostName.getValue() + ":" + this.portNumber.getValue());
         } catch (IOException e) {
             this.printErrorMessage(e.getLocalizedMessage());
         }

src/net/sharksystem/ui/messenger/cli/commands/messenger/UICommandSendMessage.java

@@ -20,6 +20,7 @@ public UICommandOpenTCP(SharkNetMessengerApp sharkMessengerApp, SharkNetMessenge
     protected void execute() throws Exception {
         try {
             this.getSharkMessengerApp().openTCPConnection(this.getIntegerArgument());
+            this.getSharkMessengerApp().tellUI("TCP port opened: " + this.getIntegerArgument());
         } catch (IOException e) {
             this.printErrorMessage(e.getLocalizedMessage());
         }

src/net/sharksystem/ui/messenger/cli/commands/tcp/UICommandConnectTCP.java

@@ -0,0 +1,28 @@
+package net.sharksystem.ui.messenger.cli.commands.testing;
+
+class Helper {
+    public static final String SNM_CLI_JAR_FILENAME = "SharkNetMessengerCLI.jar";
+
+    static String getFriendlyPeerName(String peerName) {
+        if(peerName.length() != 1) return peerName; // already friendly - hopefully
+
+        switch (peerName) {
+            case "0":
+            case "A":
+                return "Alice";
+            case "1":
+            case "B":
+                return "Bob";
+            case "2":
+            case "C":
+                return "Clara";
+            case "3":
+            case "D":
+                return "David";
+            case "4":
+            case "E":
+                return "Eve";
+            default: return peerName;
+        }
+    }
+}