[maven-release-plugin] prepare release gclc-1.3.4

Signed-off-by: Emmanuel Bigeon <emmanuel@bigeon.fr>

gclc-socket/pom.xml

@@ -70,7 +70,7 @@ of Emmanuel Bigeon.                                                   -->
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gclc-socket</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.7-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>http://www.bigeon.fr/emmanuel</url>
   <properties>
@@ -78,16 +78,10 @@ of Emmanuel Bigeon.                                                   -->
     <project.scm.id>git.bigeon.net</project.scm.id>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
     	<groupId>fr.bigeon</groupId>
     	<artifactId>gclc</artifactId>
-    	<version>1.3.1</version>
+    	<version>1.3.4-SNAPSHOT</version>
     </dependency>
     <dependency>
     	<groupId>fr.bigeon</groupId>

gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java

@@ -35,12 +35,9 @@
 package fr.bigeon.gclc.socket;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.io.PrintWriter;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -72,7 +69,7 @@ import fr.bigeon.gclc.manager.ReadingRunnable;
  * end of the execution.
  *
  * @author Emmanuel Bigeon */
-public class SocketConsoleApplicationShell implements Runnable {
+public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
 
     /** The runnable to forward output of application to socket.
      *
@@ -98,12 +95,11 @@ public class SocketConsoleApplicationShell implements Runnable {
         @Override
         public void run() {
             try {
-                while (!socket.isOutputShutdown()) {
-                    while (!socket.isOutputShutdown() &&
-                           !consoleManager.available()) {
+                while (!socket.isClosed()) {
+                    while (!socket.isClosed() && !consoleManager.available()) {
                         waitASec();
                     }
-                    if (socket.isOutputShutdown()) {
+                    if (socket.isClosed()) {
                         return;
                     }
                     String m = consoleManager.readNextLine();
@@ -126,8 +122,6 @@ public class SocketConsoleApplicationShell implements Runnable {
     protected static final long ONE_TENTH_OF_SECOND = 100;
     /** The listening port */
     private final int port;
-    /** The input */
-    private final PipedInputStream consoleInput = new PipedInputStream();
     /** The application */
     private ConsoleApplication app;
     /** The session closing command */
@@ -195,25 +189,10 @@ public class SocketConsoleApplicationShell implements Runnable {
             this.serverSocket = actualServerSocket;
             running = true;
             // Create the streams
-            try (PipedOutputStream outStream = new PipedOutputStream();
-                 BufferedWriter writer = new BufferedWriter(
-                         new OutputStreamWriter(outStream, charset));
-                 InputStreamReader isr = new InputStreamReader(consoleInput,
-                         charset);
-                 BufferedReader inBuf = new BufferedReader(isr)) {
-                consoleInput.connect(outStream);
-                runSokectServer();
-                // Close the application
-                // Pass command to application
-                if (app.isRunning()) {
-                    writer.write(applicationShutdown + EOL);
-                    writer.flush();
-                }
-            }
-        } catch (
-
-        final IOException e) {
-            LOGGER.log(Level.SEVERE,
+            runSokectServer();
+        } catch (final IOException e) {
+            LOGGER.severe("Communication error between client and server"); //$NON-NLS-1$
+            LOGGER.log(Level.FINE,
                     "Communication error between client and server", e); //$NON-NLS-1$
         }
     }
@@ -224,7 +203,7 @@ public class SocketConsoleApplicationShell implements Runnable {
         Thread appThNext = new Thread(runnable, "gclc-ctrl"); //$NON-NLS-1$
         appThNext.start();
         while (running) {
-            LOGGER.info("Opening client"); //$NON-NLS-1$
+            LOGGER.info("Waiting client"); //$NON-NLS-1$
             try (Socket clientSocket = serverSocket.accept();
                  PrintWriter out = new PrintWriter(new OutputStreamWriter(
                          clientSocket.getOutputStream(), charset), true);
@@ -233,6 +212,7 @@ public class SocketConsoleApplicationShell implements Runnable {
                  BufferedReader in = new BufferedReader(isr);) {
                 // this is not threaded to avoid several clients at the same
                 // time
+                LOGGER.info("Opening client"); //$NON-NLS-1$
 
                 // Initiate application
                 if (!runnable.isApplicationRunning()) {
@@ -249,12 +229,21 @@ public class SocketConsoleApplicationShell implements Runnable {
                 LOGGER.log(Level.FINE,
                         "Socket closed with exception (probably due to server interruption)", //$NON-NLS-1$
                         e);
+            } catch (IOException e) {
+                throw e;
             }
             LOGGER.info("Closing client"); //$NON-NLS-1$
         }
         runnable.setRunning(false);
-        consoleManager.type(applicationShutdown);
-        LOGGER.info("Out client"); //$NON-NLS-1$
+        try {
+            consoleManager.type(applicationShutdown);
+            consoleManager.close();
+        } catch (IOException e) {
+            LOGGER.warning("Unable to close application correctly"); //$NON-NLS-1$
+            LOGGER.log(Level.FINE, "Application closing caused an exception", //$NON-NLS-1$
+                    e);
+        }
+        LOGGER.info("Closing Server"); //$NON-NLS-1$
     }
 
     /** @param runnable the runnable */
@@ -278,54 +267,66 @@ public class SocketConsoleApplicationShell implements Runnable {
      * @throws IOException if the communication failed */
     private void communicate(final Socket socket, final PrintWriter writer,
                              BufferedReader in) throws IOException {
-        Thread th = new Thread(new OutputForwardRunnable(writer, socket), "ClientComm"); //$NON-NLS-1$
+        OutputForwardRunnable cc = new OutputForwardRunnable(writer, socket);
+        Thread th = new Thread(cc, "ClientComm"); //$NON-NLS-1$
         th.start();
         if (autoClose) {
-            communicateOnce(socket, in);
+            communicateOnce(in);
         } else {
-            communicateLoop(socket, in);
+            communicateLoop(in);
         }
     }
 
-    /** @param socket the socket
-     * @param in the input from the client
+    /** @param in the input from the client
      * @throws IOException if the communication failed */
-    private void communicateOnce(Socket socket,
-                                 BufferedReader in) throws IOException {
+    private void communicateOnce(BufferedReader in) throws IOException {
         ReadingRunnable reading = new ReadingRunnable(in);
         Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
         th.start();
-        if (app.isRunning()) {
-            communicationContent(reading);
-        }
-        reading.setRunning(false);
-        socket.shutdownOutput();
+        communicationContent(reading);
+        doEndCommunication(reading);
     }
 
-    /** @param socket the socket
-     * @param in the input from the client
+    /** @param reading the reading runnable
+     * @throws IOException if the end of communication failed */
+    private void doEndCommunication(ReadingRunnable reading) throws IOException {
+        reading.setRunning(false);
+        Thread wait = consoleManager.getWaitForDelivery("Bye."); //$NON-NLS-1$
+        consoleManager.println("Bye."); //$NON-NLS-1$
+        try {
+            wait.join();
+        } catch (InterruptedException e) {
+            LOGGER.warning("The Bye wait was interrupted."); //$NON-NLS-1$
+            LOGGER.log(Level.FINE, "An interruption occured", e); //$NON-NLS-1$
+        }
+    }
+
+    /** @param in the input from the client
      * @throws IOException if the communication failed */
-    private void communicateLoop(Socket socket,
-                                 BufferedReader in) throws IOException {
+    private void communicateLoop(BufferedReader in) throws IOException {
         ReadingRunnable reading = new ReadingRunnable(in);
         Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
         th.start();
         while (app.isRunning() && communicationContent(reading)) {
             // keep on going
         }
-        reading.setRunning(false);
-        socket.shutdownOutput();
-
+        doEndCommunication(reading);
     }
 
     /** @param reading the reading
      * @return if the communication should be stopped.
      * @throws IOException if the reading failed */
     private boolean communicationContent(ReadingRunnable reading) throws IOException {
-        while (app.isRunning() && !reading.hasMessage()) {
-            synchronized (this) {
-                waitASec();
+        try {
+            while (app.isRunning() && !reading.hasMessage()) {
+                synchronized (this) {
+                    waitASec();
+                }
             }
+        } catch (IOException e) {
+            LOGGER.warning("Client seems dead. Closing communication"); //$NON-NLS-1$
+            LOGGER.log(Level.FINE, "Wait on message from client failed", e); //$NON-NLS-1$
+            return false;
         }
         if (!app.isRunning()) {
             return false;
@@ -375,4 +376,11 @@ public class SocketConsoleApplicationShell implements Runnable {
             return;
         }
     }
+
+    /* (non-Javadoc)
+     * @see java.lang.AutoCloseable#close() */
+    @Override
+    public void close() throws IOException {
+        consoleManager.close();
+    }
 }

gclc-socket/src/test/java/fr/bigeon/gclc/socket/SocketConsoleApplicationTest.java

@@ -48,20 +48,18 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
-import java.util.Arrays;
+import java.util.logging.Logger;
 
 import org.junit.Test;
 
-import fr.bigeon.smu.StringEncoder;
-
 /** Test class for {@link SocketConsoleApplicationShell}
  * 
  * @author Emmanuel Bigeon */
 @SuppressWarnings({"static-method", "unused", "javadoc", "nls"})
 public class SocketConsoleApplicationTest {
 
-    private static final StringEncoder ENCODER = new StringEncoder("%",
-            Arrays.asList("\n")); //$NON-NLS-1$
+    private static final Logger LOGGER = Logger
+            .getLogger(SocketConsoleApplicationTest.class.getName());
 
     @Test
     public void integrationTest() {
@@ -87,28 +85,20 @@ public class SocketConsoleApplicationTest {
                      new InputStreamReader(kkSocket.getInputStream()));) {
 
             String fromServer;
-            int i = 0;
+            int i = -1;
             String[] cmds = {"help", "toto", "test", "bye"};
             while ((fromServer = in.readLine()) != null) {
-                System.out.println("Server: \n" + ENCODER.decode(fromServer));
-                if (fromServer.equals("Bye.")) {
+                i++;
+                fromServer = consumeToPrompt(fromServer, in);
+                if (fromServer == null || fromServer.equals("Bye.")) {
                     break;
                 }
-                while (fromServer != null && !fromServer.equals("> ")) {
-                    fromServer = in.readLine();
-                    System.out
-                            .println("Server: \n" + ENCODER.decode(fromServer));
-                }
-                if (fromServer == null) {
-                    fail("Null pointer");
-                }
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
-                    System.out.println("Client: " + fromUser);
+                    LOGGER.fine("Client: " + fromUser);
                     out.println(fromUser);
                 }
-                i++;
             }
             assertEquals(4, i);
         } catch (final IOException e) {
@@ -126,20 +116,15 @@ public class SocketConsoleApplicationTest {
             String[] cmds = {"help", "toto", "test",
                     ConsoleTestApplication.EXIT};
             while ((fromServer = in.readLine()) != null) {
-                System.out.println("Server: \n" + ENCODER.decode(fromServer));
-                while (fromServer != null && !fromServer.equals("> ")) {
-                    System.out
-                            .println("Server: \n" + ENCODER.decode(fromServer));
-                    fromServer = in.readLine();
-                }
-                if (fromServer == null) {
+                fromServer = consumeToPrompt(fromServer, in);
+                if (fromServer == null || fromServer.equals("Bye.")) {
                     break;
                 }
-                System.out.println("Server: \n" + ENCODER.decode(fromServer));
+                LOGGER.info("Server: \n" + fromServer);
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
-                    System.out.println("Client: " + fromUser);
+                    LOGGER.info("Client: " + fromUser);
                     out.println(fromUser);
                 }
                 i++;
@@ -165,18 +150,14 @@ public class SocketConsoleApplicationTest {
             String[] cmds = {"help", "toto", "test",
                     ConsoleTestApplication.EXIT};
             while ((fromServer = in.readLine()) != null) {
-                while (fromServer != null && !fromServer.equals("> ")) {
-                    fromServer = in.readLine();
-                    System.out
-                            .println("Server: \n" + ENCODER.decode(fromServer));
-                }
-                if (fromServer == null) {
+                fromServer = consumeToPrompt(fromServer, in);
+                if (fromServer == null || fromServer.equals("Bye.")) {
                     break;
                 }
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
-                    System.out.println("Client: " + fromUser);
+                    LOGGER.fine("Client: " + fromUser);
                     out.println(fromUser);
                 }
                 i++;
@@ -212,21 +193,14 @@ public class SocketConsoleApplicationTest {
             int i = 0;
             String[] cmds = {"help", "test", "close"};
             while ((fromServer = in.readLine()) != null) {
-                assertTrue(i < 1);
-                while (fromServer != null && !fromServer.equals("> ") &&
-                       !fromServer.equals("See you")) {
-                    fromServer = in.readLine();
-                    System.out
-                            .println("Server: \n" + ENCODER.decode(fromServer));
-                }
-                if (fromServer == null || fromServer.equals("Bye.") ||
-                    fromServer.equals("See you")) {
+                fromServer = consumeToPrompt(fromServer, in);
+                if (fromServer == null || fromServer.equals("Bye.")) {
                     break;
                 }
-
+                assertTrue(i < 1);
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
-                    System.out.println("Client: " + fromUser);
+                    LOGGER.fine("Client: " + fromUser);
                     out.println(fromUser);
                 }
                 i++;
@@ -249,4 +223,19 @@ public class SocketConsoleApplicationTest {
             e.printStackTrace();
         }
     }
+
+    /** @param in the input
+     * @return the string
+     * @throws IOException if the input reading failed */
+    private String consumeToPrompt(String server,
+                                   BufferedReader in) throws IOException {
+        String fromServer = server;
+        LOGGER.fine("Server: \n" + fromServer);
+        while (fromServer != null && !fromServer.equals("Bye.") &&
+               !fromServer.equals("> ")) {
+            fromServer = in.readLine();
+            LOGGER.fine("Server: \n" + fromServer);
+        }
+        return fromServer;
+    }
 }

gclc-swt/pom.xml

@@ -35,7 +35,7 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>gclc-swt</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.3-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>http://www.bigeon.fr/emmanuel</url>
   <properties>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>gclc</artifactId>
-      <version>1.3.1</version>
+      <version>1.3.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>fr.bigeon</groupId>
@@ -64,7 +64,7 @@
   <description>provide a swt window for console applications</description>
   <scm>
     <developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
-    <tag>gclc-swt-1.1.1</tag>
+    <tag>HEAD</tag>
   </scm>
   <profiles>
     <profile>

gclc-swt/src/main/java/fr/bigeon/gclc/swt/AOutputForwardRunnable.java

@@ -1,133 +0,0 @@
-/*
- * Copyright E. Bigeon (2015)
- *
- * emmanuel@bigeon.fr
- *
- * This software is a computer program whose purpose is to
- * provide a swt window for console applications.
- *
- * This software is governed by the CeCILL license under French law and
- * abiding by the rules of distribution of free software.  You can  use,
- * modify and/or redistribute the software under the terms of the CeCILL
- * license as circulated by CEA, CNRS and INRIA at the following URL
- * "http://www.cecill.info".
- *
- * As a counterpart to the access to the source code and  rights to copy,
- * modify and redistribute granted by the license, users are provided only
- * with a limited warranty  and the software's author,  the holder of the
- * economic rights,  and the successive licensors  have only  limited
- * liability.
- *
- * In this respect, the user's attention is drawn to the risks associated
- * with loading,  using,  modifying and/or developing or reproducing the
- * software by the user in light of its specific status of free software,
- * that may mean  that it is complicated to manipulate,  and  that  also
- * therefore means  that it is reserved for developers  and  experienced
- * professionals having in-depth computer knowledge. Users are therefore
- * encouraged to load and test the software's suitability as regards their
- * requirements in conditions enabling the security of their systems and/or
- * data to be ensured and,  more generally, to use and operate it in the
- * same conditions as regards security.
- *
- * The fact that you are presently reading this means that you have had
- * knowledge of the CeCILL license and that you accept its terms.
- */
-/**
- * gclc:fr.bigeon.gclc.tools.AOutputForwardRunnable.java
- * Created on: Dec 1, 2016
- */
-package fr.bigeon.gclc.swt;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import fr.bigeon.gclc.manager.PipedConsoleManager;
-
-/** An incomplete implematation used to forward messages from a piped console.
- * <p>
- * This forwarding can be interrupted without closing the piped manager.
- *
- * @author Emmanuel Bigeon
- * @deprecated since version 1.3.2 of gclc, this class has been integrated in
- *             the main content. */
-@Deprecated
-public abstract class AOutputForwardRunnable implements Runnable {
-
-    /** The class logger */
-    private static final Logger LOGGER = Logger
-            .getLogger(AOutputForwardRunnable.class.getName());
-    /** The default timeout (one tenth of second). */
-    private static final long DEFAULT_TIMEOUT = 100;
-    /** The manager. */
-    private final PipedConsoleManager manager;
-    /** The timeout */
-    private final long timeout;
-
-    /** Create a forward runnable with the given timeout.
-     * <p>
-     * Short timeout will be very responsive to the application actual messages,
-     * but may use computation time if the application is not verbose. Long
-     * timeout will save computation time, but will read batches of messages at
-     * once if the application is verbose. The right length for the timeout is
-     * likely to depend on the application and the use of it.
-     * <p>
-     * If you do not know what timeout length to use, please use the
-     * {@link #AOutputForwardRunnable(PipedConsoleManager)} constructor.
-     * 
-     * @param manager the manager
-     * @param timeout the timeout between message requests. */
-    public AOutputForwardRunnable(PipedConsoleManager manager, long timeout) {
-        super();
-        this.manager = manager;
-        this.timeout = timeout;
-    }
-
-    /** Create a forwarding runnable.
-     * 
-     * @param manager the manager */
-    public AOutputForwardRunnable(PipedConsoleManager manager) {
-        super();
-        this.manager = manager;
-        timeout = DEFAULT_TIMEOUT;
-    }
-
-    @Override
-    public void run() {
-        try {
-            while (isRunning()) {
-                while (isRunning() && !manager.available()) {
-                    waitASec();
-                }
-                if (!isRunning()) {
-                    return;
-                }
-                String m = manager.readNextLine();
-                forwardLine(m);
-            }
-        } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Unexpected problem in manager", //$NON-NLS-1$
-                    e);
-        }
-    }
-
-    /** @param m the line to forward */
-    protected abstract void forwardLine(String m);
-
-    /** @return if the thread should keep running */
-    protected abstract boolean isRunning();
-
-    /** a method to wait some time */
-    protected void waitASec() {
-        try {
-            synchronized (this) {
-                wait(timeout);
-            }
-        } catch (InterruptedException e) {
-            LOGGER.log(Level.SEVERE, "Interrupted wait", //$NON-NLS-1$
-                    e);
-            return;
-        }
-    }
-
-}

gclc-swt/src/main/java/fr/bigeon/gclc/swt/SWTConsoleView.java

@@ -53,6 +53,7 @@ import org.eclipse.swt.widgets.Text;
 
 import fr.bigeon.gclc.ConsoleApplication;
 import fr.bigeon.gclc.manager.PipedConsoleManager;
+import fr.bigeon.gclc.tools.AOutputForwardRunnable;
 
 /** A SWT component to connect to gclc {@link ConsoleApplication}
  * <p>
@@ -62,14 +63,13 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
     /** The local implementation of the forwarding runnable
      * 
      * @author Emmanuel Bigeon */
-    @SuppressWarnings("deprecation")
-    private final class ToSWTConsoleForwarRunnable
+    private final class ToSWTConsoleForwardRunnable
             extends AOutputForwardRunnable {
         /** The running status */
         private boolean running = true;
 
         /** @param manager the manager */
-        public ToSWTConsoleForwarRunnable(PipedConsoleManager manager) {
+        public ToSWTConsoleForwardRunnable(PipedConsoleManager manager) {
             super(manager);
         }
 
@@ -99,7 +99,7 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
     /** The actual manager */
     private PipedConsoleManager manager;
     /** The forwarding runnable */
-    private ToSWTConsoleForwarRunnable forward;
+    private ToSWTConsoleForwardRunnable forward;
 
     /** Create the composite.
      *
@@ -135,7 +135,7 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         if (forward != null) {
             forward.setRunning(false);
         }
-        forward = new ToSWTConsoleForwarRunnable(manager);
+        forward = new ToSWTConsoleForwardRunnable(manager);
         Thread th = new Thread(forward, "gclcToSWT"); //$NON-NLS-1$
         th.start();
     }
@@ -180,13 +180,6 @@ public class SWTConsoleView extends Composite implements ConsoleDelayIO {
         consoleInput.setText(string);
     }
 
-    /**
-     * 
-     */
-    public void validateCommand() {
-        validateInput();
-    }
-
     /* (non-Javadoc)
      * @see fr.bigeon.gclc.swt.ConsoleDelayIO#setInput(java.lang.String) */
     @Override

gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleShellTest.java

@@ -39,7 +39,9 @@
 package fr.bigeon.gclc.swt;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 
@@ -60,7 +62,7 @@ import fr.bigeon.gclc.exception.InvalidCommandName;
 public class SWTConsoleShellTest {
 
     protected static final long TWO_SECONDS = 2000;
-    private static final Display DISPLAY = new Display();
+    private static final Display DISPLAY = Display.getDefault();
 
     @Test
     public void testConsoleClose() {
@@ -171,6 +173,7 @@ public class SWTConsoleShellTest {
                             shell.dispose();
                         }
                     });
+
                 }
             });
             applThread.start();
@@ -180,6 +183,13 @@ public class SWTConsoleShellTest {
                     DISPLAY.sleep();
                 }
             }
+            swtConsole.setPrompt(">");
+            try {
+                swtConsole.prompt();
+                fail("Prompting when closed should fail!");
+            } catch (IOException e) {
+                assertNotNull(e);
+            }
 //            DISPLAY.dispose();
             assertTrue(appl.getManager().isClosed());
             Thread.sleep(TWO_SECONDS);

gclc-swt/src/test/java/fr/bigeon/gclc/swt/SWTConsoleViewTest.java

@@ -0,0 +1,152 @@
+/*
+ * Copyright E. Bigeon (2015)
+ *
+ * emmanuel@bigeon.fr
+ *
+ * This software is a computer program whose purpose is to
+ * provide a swt window for console applications.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc-swt:fr.bigeon.gclc.swt.SWTConsoleShellTest.java
+ * Created on: Jun 8, 2016
+ */
+package fr.bigeon.gclc.swt;
+
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
+
+import fr.bigeon.gclc.ConsoleApplication;
+import fr.bigeon.gclc.command.Command;
+import fr.bigeon.gclc.command.ExitCommand;
+import fr.bigeon.gclc.exception.InvalidCommandName;
+import fr.bigeon.gclc.manager.PipedConsoleManager;
+
+/** <p>
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+@SuppressWarnings({"javadoc", "static-method", "nls", "deprecation"})
+public class SWTConsoleViewTest {
+
+    protected static final long TWO_SECONDS = 2000;
+    private static final Display DISPLAY = Display.getDefault();
+
+    @Test
+    public void test() {
+        final Shell shell = new Shell(DISPLAY);
+        final SWTConsoleView swtConsole = new SWTConsoleView(shell, SWT.NONE);
+        try (PipedConsoleManager manager = new PipedConsoleManager()) {
+            swtConsole.setManager(manager);
+        } catch (IOException e2) {
+            assertNull(e2);
+        }
+        try (PipedConsoleManager manager = new PipedConsoleManager()) {
+            swtConsole.setManager(manager);
+            final ConsoleApplication appl = new ConsoleApplication(manager,
+                    "Hello", "See you");
+            appl.add(new ExitCommand("exit", appl));
+            appl.add(new Command("long") {
+
+                @Override
+                public String tip() {
+                    return "a long running command";
+                }
+
+                @Override
+                public void execute(String... args) {
+                    try {
+                        Thread.sleep(TWO_SECONDS);
+                    } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            });
+//            shell.pack();
+            shell.open();
+            Thread applThread = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    appl.start();
+                }
+            });
+            Thread testThread = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        Thread.sleep(TWO_SECONDS);
+                    } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    Display.getDefault().syncExec(new Runnable() {
+                        @Override
+                        public void run() {
+                            swtConsole.setText("test"); //$NON-NLS-1$
+                            swtConsole.validateInput();
+                        }
+                    });
+                    try {
+                        Thread.sleep(TWO_SECONDS);
+                    } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    Display.getDefault().syncExec(new Runnable() {
+                        @Override
+                        public void run() {
+                            shell.dispose();
+                        }
+                    });
+                }
+            });
+            applThread.start();
+            testThread.start();
+            while (!shell.isDisposed()) {
+                if (!DISPLAY.readAndDispatch()) {
+                    DISPLAY.sleep();
+                }
+            }
+        } catch (InvalidCommandName e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
+        }
+    }
+}

gclc/pom.xml

@@ -35,7 +35,7 @@
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>gclc</artifactId>
-	<version>1.3.2-SNAPSHOT</version>
+	<version>1.3.4</version>
 	<packaging>jar</packaging>
 	<url>http://www.bigeon.fr/emmanuel</url>
 	<properties>
@@ -83,6 +83,6 @@
   <scm>
   
     <developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
-	<tag>HEAD</tag>
+	<tag>gclc-1.3.4</tag>
   </scm>
 </project>

gclc/src/main/java/fr/bigeon/gclc/ConsoleApplication.java

@@ -148,7 +148,7 @@ public class ConsoleApplication implements ICommandProvider {
             args = GCLCConstants.splitCommand(cmd);
         } catch (CommandParsingException e1) {
             manager.println("Command line cannot be parsed"); //$NON-NLS-1$
-            LOGGER.log(Level.INFO, "Invalid user command " + cmd, e1); //$NON-NLS-1$
+            LOGGER.log(Level.FINE, "Invalid user command " + cmd, e1); //$NON-NLS-1$
             return;
         }
         if (!args.isEmpty()) {
@@ -156,7 +156,7 @@ public class ConsoleApplication implements ICommandProvider {
                 executeSub(args.get(0), Arrays.copyOfRange(
                         args.toArray(new String[0]), 1, args.size()));
             } catch (final CommandRunException e) {
-                LOGGER.log(Level.WARNING, "Command failed: " + cmd, e); //$NON-NLS-1$
+                LOGGER.log(Level.FINE, "Command failed: " + cmd, e); //$NON-NLS-1$
                 manager.println(Messages
                         .getString("ConsoleApplication.cmd.failed", cmd)); //$NON-NLS-1$
                 manager.println(e.getLocalizedMessage());
@@ -187,8 +187,10 @@ public class ConsoleApplication implements ICommandProvider {
         } catch (IOException e) {
             // The manager was closed
             running = false;
-            LOGGER.log(Level.WARNING,
-                    "The console manager was closed. Closing the application as no one can reach it.", //$NON-NLS-1$
+            LOGGER.warning(
+                    "The console manager was closed. Closing the application as no one can reach it."); //$NON-NLS-1$
+            LOGGER.log(Level.FINE,
+                    "An exception caused the closing of the application", //$NON-NLS-1$
                     e);
             return;
         }
@@ -201,8 +203,9 @@ public class ConsoleApplication implements ICommandProvider {
             } catch (IOException e) {
                 // The manager was closed
                 running = false;
-                LOGGER.log(Level.WARNING,
-                        "The console manager was closed.", //$NON-NLS-1$
+                LOGGER.warning("The console manager was closed."); //$NON-NLS-1$
+                LOGGER.log(Level.FINE,
+                        "An exception occured when trying to print the good by e message... The application will still close.", //$NON-NLS-1$
                         e);
             }
         }
@@ -225,14 +228,17 @@ public class ConsoleApplication implements ICommandProvider {
             }
             interpretCommand(cmd);
         } catch (InterruptedIOException e) {
-            LOGGER.log(Level.INFO,
-                    "Prompt interrupted. It is likely the application is closing.", //$NON-NLS-1$
+            LOGGER.info(
+                    "Prompt interrupted. It is likely the application is closing."); //$NON-NLS-1$
+            LOGGER.log(Level.FINER, "Interruption of the prompt.", //$NON-NLS-1$
                     e);
         } catch (IOException e) {
             // The manager was closed
             running = false;
-            LOGGER.log(Level.WARNING,
-                    "The console manager was closed. Closing the application as no one can reach it.", //$NON-NLS-1$
+            LOGGER.warning(
+                    "The console manager was closed. Closing the application as no one can reach it."); //$NON-NLS-1$
+            LOGGER.log(Level.FINE,
+                    "An exception caused the closing of the application", //$NON-NLS-1$
                     e);
         }
     }

gclc/src/main/java/fr/bigeon/gclc/command/CommandParameters.java

@@ -45,6 +45,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import fr.bigeon.gclc.exception.CommandParsingException;
+
 /** <p>
  * An object representing a collection of parameters. It is used for defaulting
  * values.
@@ -98,8 +100,8 @@ public class CommandParameters {
     }
 
     /** @param args the arguments to parse
-     * @return if the arguments were parsed */
-    public boolean parseArgs(String... args) {
+     * @throws CommandParsingException if the arguments parsing failed */
+    public void parseArgs(String... args) throws CommandParsingException {
         int i = 0;
         while (i < args.length) {
             String next = null;
@@ -108,11 +110,11 @@ public class CommandParameters {
             }
             int p = parseArg(args[i], next);
             if (p == 0) {
-                return false;
+                throw new CommandParsingException(
+                        "Invalid parameter " + args[i]); //$NON-NLS-1$
             }
             i += p;
         }
-        return true;
 
     }
 
@@ -126,7 +128,7 @@ public class CommandParameters {
      * @return the number of element read */
     private int parseArg(String arg, String next) {
         if (!arg.startsWith("-")) { //$NON-NLS-1$
-            return 1;
+            return strict ? 0 : 1;
         }
         String name = arg.substring(1);
         if (booleanArguments.containsKey(name)) {

gclc/src/main/java/fr/bigeon/gclc/command/ParametrizedCommand.java

@@ -48,6 +48,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import fr.bigeon.gclc.exception.CommandParsingException;
 import fr.bigeon.gclc.exception.CommandRunException;
 import fr.bigeon.gclc.exception.CommandRunExceptionType;
 import fr.bigeon.gclc.exception.InvalidParameterException;
@@ -60,8 +61,7 @@ import fr.bigeon.gclc.manager.ConsoleManager;
 public abstract class ParametrizedCommand extends Command {
 
     /** If the command may use interactive prompting for required parameters
-     * that
-     * were not provided on execution */
+     * that were not provided on execution */
     private boolean interactive = true;
     /** The manager */
     protected final ConsoleManager manager;
@@ -72,8 +72,7 @@ public abstract class ParametrizedCommand extends Command {
     /** The parameters mandatory status */
     private final Map<String, Boolean> params = new HashMap<>();
     /** The restriction of provided parameters on execution to declared
-     * paramters
-     * in the status maps. */
+     * paramters in the status maps. */
     private final boolean strict;
 
     /** @param manager the manager
@@ -110,7 +109,11 @@ public abstract class ParametrizedCommand extends Command {
      * @param param the parameter identification
      * @param stringParameter if the parameter is a parameter with an argument
      * @param needed if the parameter is required
-     * @throws InvalidParameterException if the parameter was invalid */
+     * @throws InvalidParameterException if the parameter was invalid
+     * @deprecated since gclc-1.3.3, use the
+     *             {@link #addStringParameter(String, boolean)} and
+     *             {@link #addBooleanParameter(String)} */
+    @Deprecated
     protected void addParameter(String param, boolean stringParameter,
                                 boolean needed) throws InvalidParameterException {
         if (params.containsKey(param)) {
@@ -131,10 +134,42 @@ public abstract class ParametrizedCommand extends Command {
         }
     }
 
+    /** Add a boolean parameter to defined parmaters.
+     * 
+     * @param flag the boolean flag
+     * @throws InvalidParameterException if the parameter is already defined as
+     *             a string parameter */
+    protected void addBooleanParameter(String flag) throws InvalidParameterException {
+        if (params.containsKey(flag) && stringParams.containsKey(flag)) {
+            throw new InvalidParameterException(
+                    "Parameter is already defined as string"); //$NON-NLS-1$
+        }
+        boolParams.add(flag);
+        params.put(flag, Boolean.valueOf(false));
+    }
+
+    /** Add a string parameter to defined parmaters.
+     * 
+     * @param flag the parameter flag
+     * @param needed if the parameter's absence should cause an exception
+     * @throws InvalidParameterException if the parameter is already defined as
+     *             a boolean parameter */
+    protected void addStringParameter(String flag,
+                                      boolean needed) throws InvalidParameterException {
+        if (params.containsKey(flag)) {
+            checkParam(flag, needed);
+            return;
+        }
+        stringParams.put(flag, Boolean.valueOf(needed));
+        params.put(flag, Boolean.valueOf(needed));
+    }
+
     /** @param param the parameter
      * @param stringParameter the string parameter type
      * @param needed if the parameter is needed
-     * @throws InvalidParameterException if the new definition is invalid */
+     * @throws InvalidParameterException if the new definition is invalid
+     * @deprecated since 1.3.3 */
+    @Deprecated
     private void checkParam(String param, boolean stringParameter,
                             boolean needed) throws InvalidParameterException {
         if (stringParameter) {
@@ -154,6 +189,22 @@ public abstract class ParametrizedCommand extends Command {
         }
     }
 
+    /** @param param the string parameter
+     * @param needed if the parameter is needed
+     * @throws InvalidParameterException if the new definition is invalid */
+    private void checkParam(String param,
+                            boolean needed) throws InvalidParameterException {
+        if (stringParams.containsKey(param)) {
+            Boolean need = Boolean
+                    .valueOf(needed || stringParams.get(param).booleanValue());
+            stringParams.put(param, need);
+            params.put(param, need);
+            return;
+        }
+        throw new InvalidParameterException(
+                "Parameter is already defined as boolean"); //$NON-NLS-1$
+    }
+
     /** @param parameters the command parameters
      * @throws CommandRunException if the command failed */
     protected abstract void doExecute(CommandParameters parameters) throws CommandRunException;
@@ -163,12 +214,13 @@ public abstract class ParametrizedCommand extends Command {
     @SuppressWarnings("boxing")
     @Override
     public final void execute(String... args) throws CommandRunException {
-        final CommandParameters parameters = new CommandParameters(
-                boolParams, stringParams.keySet(), strict);
-        if (!parameters.parseArgs(args)) {
-            // the parameters could not be correctly parsed
+        final CommandParameters parameters = new CommandParameters(boolParams,
+                stringParams.keySet(), strict);
+        try {
+            parameters.parseArgs(args);
+        } catch (CommandParsingException e) {
             throw new CommandRunException(CommandRunExceptionType.USAGE,
-                    "Unable to read arguments", this); //$NON-NLS-1$
+                    "Unable to read arguments", e, this); //$NON-NLS-1$
         }
         final List<String> toProvide = new ArrayList<>();
         for (final Entry<String, Boolean> string : params.entrySet()) {

gclc/src/main/java/fr/bigeon/gclc/manager/ConsoleManager.java

@@ -48,7 +48,7 @@ import java.io.InterruptedIOException;
  * a message, in that case, the usual behavior is to prompt normally.
  *
  * @author Emmanuel BIGEON */
-public interface ConsoleManager {
+public interface ConsoleManager extends AutoCloseable {
 
     /** @return the prompt prefix */
     String getPrompt();
@@ -89,6 +89,7 @@ public interface ConsoleManager {
     /** Closes the manager.
      * 
      * @throws IOException if the close raised an exception */
+    @Override
     void close() throws IOException;
 
     /** @return if the manager is closed. */

gclc/src/main/java/fr/bigeon/gclc/manager/PipedConsoleManager.java

@@ -54,7 +54,7 @@ import java.nio.charset.Charset;
  *
  * @author Emmanuel Bigeon */
 public final class PipedConsoleManager
-        implements ConsoleManager, AutoCloseable {
+        implements ConsoleManager {
 
     /** The encoding between streams */
     private static final String UTF_8 = "UTF-8"; //$NON-NLS-1$
@@ -91,6 +91,7 @@ public final class PipedConsoleManager
         Thread th = new Thread(writing, "write"); //$NON-NLS-1$
         th.start();
         th = new Thread(reading, "read"); //$NON-NLS-1$
+        th.setDaemon(true);
         th.start();
     }
 
@@ -171,4 +172,12 @@ public final class PipedConsoleManager
     public void interruptPrompt() {
         innerManager.interruptPrompt();
     }
+
+    /** @param message the message
+     * @return the thread to join to wait for message delivery
+     * @see fr.bigeon.gclc.manager.ReadingRunnable#getWaitForDelivery(java.lang.String) */
+    public Thread getWaitForDelivery(String message) {
+        return reading.getWaitForDelivery(message);
+    }
+
 }

gclc/src/main/java/fr/bigeon/gclc/manager/ReadingRunnable.java

@@ -43,6 +43,8 @@ import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -51,6 +53,61 @@ import java.util.logging.Logger;
  * @author Emmanuel Bigeon */
 public class ReadingRunnable implements Runnable {
 
+    /** The runnable to wait for notification on an object
+     *
+     * @author Emmanuel Bigeon */
+    private final class ToWaitRunnable implements Runnable {
+        /** The Object */
+        private final Object obj;
+        /** The locking object */
+        private final Object start;
+        /** The message */
+        private final String message;
+        /** The started status */
+        private boolean started = false;
+
+        /** @param obj the object to lock on
+         * @param start the object to notify when ready to wait
+         * @param message the message to wait for */
+        public ToWaitRunnable(Object obj, Object start,
+                String message) {
+            this.obj = obj;
+            this.start = start;
+            this.message = message;
+        }
+
+        @SuppressWarnings("synthetic-access")
+        @Override
+        public void run() {
+            synchronized (obj) {
+                synchronized (start) {
+                    started = true;
+                    start.notify();
+                }
+                while (isRunning()) {
+                    try {
+                        obj.wait();
+                        if (delivering.equals(message)) {
+                            return;
+                        }
+                    } catch (InterruptedException e) {
+                        LOGGER.log(Level.SEVERE,
+                                THREAD_INTERRUPTION_EXCEPTION, e); 
+                    }
+                }
+            }
+        }
+
+        /** @return the started */
+        public boolean isStarted() {
+            synchronized (start) {
+                return started;
+            }
+        }
+    }
+
+    /** The thread intteruption logging message */
+    private static final String THREAD_INTERRUPTION_EXCEPTION = "Thread interruption exception."; //$NON-NLS-1$
     /** The closed pipe message */
     private static final String CLOSED_PIPE = "Closed pipe"; //$NON-NLS-1$
     /** Wait timeout */
@@ -69,6 +126,16 @@ public class ReadingRunnable implements Runnable {
     private final Object lock = new Object();
     /** The waiting status for a message */
     private boolean waiting;
+    /**
+     * The blocker for a given message
+     */
+    private final Map<String, Object> messageBlocker = new HashMap<>();
+    /**
+     * The lock
+     */
+    private final Object messageBlockerLock = new Object();
+    /** The message being delivered */
+    private String delivering;
 
     /** @param reader the input to read from */
     public ReadingRunnable(BufferedReader reader) {
@@ -96,10 +163,13 @@ public class ReadingRunnable implements Runnable {
                     lock.notify();
                 }
             } catch (InterruptedIOException e) {
-                LOGGER.log(Level.INFO, "Reading interrupted", e); //$NON-NLS-1$
-
+                LOGGER.info("Reading interrupted"); //$NON-NLS-1$
+                LOGGER.log(Level.FINER,
+                        "Read interruption was caused by an exception", e); //$NON-NLS-1$
             } catch (IOException e) {
-                LOGGER.log(Level.SEVERE, "Unable to read from stream", e); //$NON-NLS-1$
+                LOGGER.severe("Unable to read from stream"); //$NON-NLS-1$
+                LOGGER.log(Level.FINE, "The stream reading threw an exception", //$NON-NLS-1$
+                        e);
                 running = false;
                 return;
             }
@@ -132,7 +202,7 @@ public class ReadingRunnable implements Runnable {
                 try {
                     lock.wait(TIMEOUT);
                 } catch (InterruptedException e) {
-                    LOGGER.log(Level.SEVERE, "Thread interruption exception.", //$NON-NLS-1$
+                    LOGGER.log(Level.SEVERE, THREAD_INTERRUPTION_EXCEPTION, 
                             e);
                 }
                 if (messages.isEmpty() && !running) {
@@ -141,6 +211,7 @@ public class ReadingRunnable implements Runnable {
             }
             LOGGER.finest("Polled: " + messages.peek()); //$NON-NLS-1$
             waiting = false;
+            notifyMessage(messages.peek());
             return messages.poll();
         }
     }
@@ -179,4 +250,45 @@ public class ReadingRunnable implements Runnable {
             }
         }
     }
+
+    /** @param message the message */
+    private void notifyMessage(String message) {
+        synchronized (messageBlockerLock) {
+            delivering = message;
+            if (messageBlocker.containsKey(message)) {
+                Object mLock = messageBlocker.get(message);
+                synchronized (mLock) {
+                    mLock.notify();
+                }
+                messageBlocker.remove(message);
+            }
+        }
+    }
+
+    /** @param message the message
+     * @return the thread to join to wait for message delivery */
+    public Thread getWaitForDelivery(final String message) {
+        synchronized (messageBlockerLock) {
+            if (!messageBlocker.containsKey(message)) {
+                messageBlocker.put(message, new Object());
+            }
+            final Object obj = messageBlocker.get(message);
+            final Object start = new Object();
+            ToWaitRunnable waitRunn = new ToWaitRunnable(obj, start, message);
+            Thread th = new Thread(waitRunn);
+
+            synchronized (start) {
+                th.start();
+                while (!waitRunn.isStarted()) {
+                    try {
+                        start.wait(TIMEOUT);
+                    } catch (InterruptedException e) {
+                        LOGGER.log(Level.SEVERE, THREAD_INTERRUPTION_EXCEPTION, 
+                                e);
+                    }
+                }
+            }
+            return th;
+        }
+    }
 }

gclc/src/main/java/fr/bigeon/gclc/manager/SystemConsoleManager.java

@@ -88,6 +88,7 @@ public final class SystemConsoleManager implements ConsoleManager { // NOSONAR
         this.in = new BufferedReader(new InputStreamReader(in, charset));
         reading = new ReadingRunnable(this.in);
         promptThread = new Thread(reading, "prompt"); //$NON-NLS-1$
+        promptThread.setDaemon(true);
         promptThread.start();
     }
 
@@ -156,6 +157,7 @@ public final class SystemConsoleManager implements ConsoleManager { // NOSONAR
     public void close() throws IOException {
         closed = true;
         reading.setRunning(false);
+        promptThread.interrupt();
     }
 
     /* (non-Javadoc)

gclc/src/main/java/fr/bigeon/gclc/prompt/CLIPrompter.java

@@ -245,8 +245,8 @@ public class CLIPrompter {
                 r = Integer.parseInt(result);
                 still = false;
             } catch (final NumberFormatException e) {
-                LOGGER.log(Level.INFO,
-                        "User input a non parsable integer: " + result, e); //$NON-NLS-1$
+                LOGGER.info("User input a non parsable integer: " + result); //$NON-NLS-1$
+                LOGGER.log(Level.FINEST, "Unrecognized integer", e); //$NON-NLS-1$
                 still = true;
             }
         }

gclc/src/main/java/fr/bigeon/gclc/prompt/CLIPrompterMessages.java

@@ -74,7 +74,8 @@ public class CLIPrompterMessages {
         try {
             return MessageFormat.format(RESOURCE_BUNDLE.getString(key), args);
         } catch (final MissingResourceException e) {
-            LOGGER.log(Level.WARNING, "Unrecognized key: " + key, e); //$NON-NLS-1$
+            LOGGER.warning("Unrecognized key: " + key); //$NON-NLS-1$
+            LOGGER.log(Level.FINE, "Missing key in " + BUNDLE_NAME, e); //$NON-NLS-1$
             return '!' + key + '!';
         }
     }

gclc/src/main/java/fr/bigeon/gclc/tools/AOutputForwardRunnable.java

@@ -1,3 +1,37 @@
+/*
+ * Copyright Bigeon Emmanuel (2014)
+ *
+ * emmanuel@bigeon.fr
+ *
+ * This software is a computer program whose purpose is to
+ * provide a generic framework for console applications.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
 /**
  * gclc:fr.bigeon.gclc.tools.AOutputForwardRunnable.java
  * Created on: Dec 1, 2016

gclc/src/main/resources/fr/bigeon/gclc/messages.properties

@@ -16,7 +16,8 @@ promptbool.choices.no1=N
 promptbool.choices.no2=no
 
 promptchoice.outofbounds=Please choose something between {0} and {1}. The choices were:
-promptchoice.formaterr=The input seems to be something that is not an integer.\nPlease choose something between {0} and {1}. The choices were:
+promptchoice.formaterr=The input seems to be something that is not an integer.\
+Please choose something between {0} and {1}. The choices were:
 
 promptlongtext.exit.defaultkey=\\q
 promptlongtext.exit.dispkey=\ (exit with a new line made of "{0}")

gclc/src/test/java/fr/bigeon/gclc/command/CommandParametersTest.java

@@ -40,45 +40,54 @@ package fr.bigeon.gclc.command;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.junit.Test;
 
-/**
- * <p>
+import fr.bigeon.gclc.exception.CommandParsingException;
+
+/** <p>
  * TODO
  *
- * @author Emmanuel Bigeon
- *
- */
+ * @author Emmanuel Bigeon */
 @SuppressWarnings({"static-method", "nls"})
 public class CommandParametersTest {
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#CommandParameters(java.util.Set, java.util.Set, boolean)}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#CommandParameters(java.util.Set, java.util.Set, boolean)}. */
     @Test
-    public final void testCommandParameters(){
+    public final void testCommandParameters() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
         CommandParameters parameters = new CommandParameters(bools, strings,
                 true);
 
-        assertFalse(parameters.parseArgs("-ungivenFlag"));
+        try {
+            parameters.parseArgs("-ungivenFlag");
+            fail("parse of unknown in strict should fail");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
         parameters = new CommandParameters(bools, strings, false);
 
-        assertTrue(parameters.parseArgs("-ungivenFlag"));
+        try {
+            parameters.parseArgs("-ungivenFlag");
+        } catch (CommandParsingException e) {
+            fail("parse of unknown in non strict should suceed");
+            assertNull(e);
+        }
     }
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#get(java.lang.String)}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#get(java.lang.String)}. */
     @Test
-    public final void testGet(){
+    public final void testGet() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
 
@@ -91,24 +100,35 @@ public class CommandParametersTest {
         assertNull(parameters.get("ungiven"));
         assertNull(parameters.get("str"));
 
-        parameters.parseArgs("-ungiven", "val");
+        try {
+            parameters.parseArgs("-ungiven", "val");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
         assertNull(parameters.get("ungiven"));
         assertNull(parameters.get("str"));
 
-        parameters.parseArgs("-str", "val");
+        try {
+            parameters.parseArgs("-str", "val");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
         assertNull(parameters.get("ungiven"));
         assertEquals("val", parameters.get("str"));
 
-        parameters.parseArgs("-ungiven");
+        try {
+            parameters.parseArgs("-ungiven");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
         assertNull(parameters.get("ungiven"));
         assertEquals("val", parameters.get("str"));
     }
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#getAdditionals()}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#getAdditionals()}. */
     @Test
-    public final void testGetAdditionals(){
+    public final void testGetAdditionals() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
 
@@ -118,27 +138,42 @@ public class CommandParametersTest {
         CommandParameters parameters = new CommandParameters(bools, strings,
                 true);
 
-        parameters.parseArgs("-boolFlag");
+        try {
+            parameters.parseArgs("-boolFlag");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
         assertTrue(parameters.getAdditionals().isEmpty());
 
-        parameters.parseArgs("-ungiven");
+        try {
+            parameters.parseArgs("-ungiven");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
         assertTrue(parameters.getAdditionals().isEmpty());
 
         parameters = new CommandParameters(bools, strings, false);
 
-        parameters.parseArgs("-boolFlag");
+        try {
+            parameters.parseArgs("-boolFlag");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
         assertTrue(parameters.getAdditionals().isEmpty());
 
-        parameters.parseArgs("-ungiven");
+        try {
+            parameters.parseArgs("-ungiven");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
         assertTrue(parameters.getAdditionals().contains("ungiven"));
         assertEquals(1, parameters.getAdditionals().size());
     }
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#getBool(java.lang.String)}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#getBool(java.lang.String)}. */
     @Test
-    public final void testGetBool(){
+    public final void testGetBool() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
 
@@ -151,11 +186,20 @@ public class CommandParametersTest {
         assertFalse(parameters.getBool("ungiven"));
         assertFalse(parameters.getBool("boolFlag"));
 
-        parameters.parseArgs("-boolFlag");
+        try {
+            parameters.parseArgs("-boolFlag");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
         assertTrue(parameters.getBool("boolFlag"));
         assertFalse(parameters.getBool("ungiven"));
 
-        parameters.parseArgs("-ungiven");
+        try {
+            parameters.parseArgs("-ungiven");
+            fail("unknown parameter should fail");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
         assertFalse(parameters.getBool("ungiven"));
         assertTrue(parameters.getBool("boolFlag"));
 
@@ -164,20 +208,27 @@ public class CommandParametersTest {
         assertFalse(parameters.getBool("ungiven"));
         assertFalse(parameters.getBool("boolFlag"));
 
-        parameters.parseArgs("-boolFlag");
+        try {
+            parameters.parseArgs("-boolFlag");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
         assertTrue(parameters.getBool("boolFlag"));
         assertFalse(parameters.getBool("ungiven"));
 
-        parameters.parseArgs("-ungiven");
+        try {
+            parameters.parseArgs("-ungiven");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
         assertFalse(parameters.getBool("ungiven"));
         assertTrue(parameters.getBool("boolFlag"));
     }
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#parseArgs(java.lang.String[])}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#parseArgs(java.lang.String[])}. */
     @Test
-    public final void testParseArgs(){
+    public final void testParseArgs() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
 
@@ -187,19 +238,40 @@ public class CommandParametersTest {
         CommandParameters parameters = new CommandParameters(bools, strings,
                 true);
 
-        assertFalse(parameters.parseArgs("-ungivenFlag"));
-        assertFalse(parameters.parseArgs("-str"));
-        assertTrue(parameters.parseArgs("-boolFlag"));
-        assertTrue(parameters.parseArgs("-str", "-boolFlag"));
-        assertTrue(parameters.parseArgs("-boolFlag", "-str", "val"));
+        try {
+            parameters.parseArgs("-ungivenFlag");
+            fail("unknown argument should fail in strict");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
+        try {
+            parameters.parseArgs("-str");
+            fail("missing string argument value should fail");
+        } catch (CommandParsingException e) {
+            assertNotNull(e);
+        }
+        try {
+            parameters.parseArgs("-boolFlag");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
+        try {
+            parameters.parseArgs("-str", "-boolFlag");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
+        try {
+            parameters.parseArgs("-boolFlag", "-str", "val");
+        } catch (CommandParsingException e) {
+            assertNull(e);
+        }
 
     }
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#set(java.lang.String, boolean)}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#set(java.lang.String, boolean)}. */
     @Test
-    public final void testSetStringBoolean(){
+    public final void testSetStringBoolean() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
 
@@ -234,11 +306,10 @@ public class CommandParametersTest {
         assertTrue(parameters.getBool("boolFlag"));
     }
 
-    /**
-     * Test method for {@link fr.bigeon.gclc.command.CommandParameters#set(java.lang.String, java.lang.String)}.
-     */
+    /** Test method for
+     * {@link fr.bigeon.gclc.command.CommandParameters#set(java.lang.String, java.lang.String)}. */
     @Test
-    public final void testSetStringString(){
+    public final void testSetStringString() {
         Set<String> strings = new HashSet<>();
         Set<String> bools = new HashSet<>();
 

gclc/src/test/java/fr/bigeon/gclc/command/ParametrizedCommandTest.java

@@ -392,21 +392,20 @@ public class ParametrizedCommandTest {
                 assertEquals(2, parameters.getStringArgumentKeys().size());
                 switch (call) {
                 case 0:
-                case 1:
                     assertNull(parameters.get(str1));
                     assertNull(parameters.get(str2));
                     assertFalse(parameters.getBool(bool1));
                     assertFalse(parameters.getBool(bool2));
                     call++;
                     break;
-                case 2:
+                case 1:
                     assertEquals(str2, parameters.get(str1));
                     assertNull(parameters.get(str2));
                     assertFalse(parameters.getBool(bool1));
                     assertFalse(parameters.getBool(bool2));
                     call++;
                     break;
-                case 3:
+                case 2:
                     assertEquals(str2, parameters.get(str1));
                     assertNull(parameters.get(str2));
                     assertTrue(parameters.getBool(bool1));
@@ -420,12 +419,17 @@ public class ParametrizedCommandTest {
         };
         try {
             cmd.execute();
-            cmd.execute(addParam);
             cmd.execute("-" + str1, str2);
             cmd.execute("-" + str1, str2, "-" + bool1);
         } catch (CommandRunException e) {
             assertNull(e);
-            fail("unepected error");
+            fail("unexpected error");
+        }
+        try {
+            cmd.execute(addParam);
+            fail("Strict should fail with unexpected argument");
+        } catch (CommandRunException e) {
+            assertNotNull(e);
         }
         try {
             cmd.execute("-" + addParam);
@@ -504,11 +508,16 @@ public class ParametrizedCommandTest {
         try {
             cmd.execute("-" + str1, str2);
             cmd.execute("-" + str1, str2, "-" + bool1);
-            cmd.execute("-" + str1, str2, addParam);
         } catch (CommandRunException e) {
             assertNull(e);
             fail("unepected error");
         }
+        try {
+            cmd.execute("-" + str1, str2, addParam);
+            fail("Additional parameter should cause failure");
+        } catch (CommandRunException e) {
+            assertNotNull(e);
+        }
         try {
             cmd.execute();
             fail("needed " + str1 + " not provided shall fail");

gclc/src/test/java/fr/bigeon/gclc/manager/ReadingRunnableTest.java

@@ -0,0 +1,149 @@
+/*
+ * Copyright Bigeon Emmanuel (2014)
+ *
+ * emmanuel@bigeon.fr
+ *
+ * This software is a computer program whose purpose is to
+ * provide a generic framework for console applications.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc:fr.bigeon.gclc.manager.ReadingRunnableTest.java
+ * Created on: Dec 6, 2016
+ */
+package fr.bigeon.gclc.manager;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/** <p>
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+public class ReadingRunnableTest {
+
+    /**
+     */
+    @Before
+    public void setUp() {}
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.manager.ReadingRunnable#getMessage()}. */
+    @Test
+    public final void testGetMessage() {
+        BufferedReader reader = null;
+        ReadingRunnable runnable = new ReadingRunnable(reader);
+        runnable.setRunning(false);
+
+        try {
+            runnable.getMessage();
+            fail("reading from closed runnable");
+        } catch (IOException e) {
+            assertNotNull(e);
+        }
+
+    }
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.manager.ReadingRunnable#hasMessage()}. */
+    @Test
+    public final void testHasMessage() {
+
+        BufferedReader reader = null;
+        ReadingRunnable runnable = new ReadingRunnable(reader);
+        runnable.setRunning(false);
+
+        try {
+            runnable.getMessage();
+            fail("reading from closed runnable");
+        } catch (IOException e) {
+            assertNotNull(e);
+        }
+    }
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.manager.ReadingRunnable#getWaitForDelivery(java.lang.String)}.
+     * 
+     * @throws InterruptedException */
+    @Test
+    public final void testGetWaitForDelivery() throws InterruptedException {
+        try (PipedOutputStream out = new PipedOutputStream();
+             InputStream piped = new PipedInputStream(out);
+             BufferedReader reader = new BufferedReader(
+                     new InputStreamReader(piped, "UTF-8"))) {
+            final ReadingRunnable runnable = new ReadingRunnable(reader);
+            Thread th0 = new Thread(runnable, "read");
+            th0.start();
+            Thread th = runnable.getWaitForDelivery("");
+
+            final Object start = new Object();
+
+            Thread th2 = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    synchronized (start) {
+                        start.notify();
+                    }
+                    try {
+                        runnable.getMessage();
+                    } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            }, "get");
+            synchronized (start) {
+                th2.start();
+                start.wait();
+            }
+            runnable.interrupt();
+            try {
+                th.join();
+            } catch (InterruptedException e) {
+                assertNull(e);
+            }
+            runnable.setRunning(false);
+            out.close();
+        } catch (IOException e1) {
+            assertNull(e1);
+        }
+    }
+
+}

gclc/src/test/java/fr/bigeon/gclc/tools/AOutputForwardRunnableTest.java

@@ -0,0 +1,141 @@
+/*
+ * Copyright Bigeon Emmanuel (2014)
+ *
+ * emmanuel@bigeon.fr
+ *
+ * This software is a computer program whose purpose is to
+ * provide a generic framework for console applications.
+ *
+ * This software is governed by the CeCILL license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ */
+/**
+ * gclc:fr.bigeon.gclc.tools.AOutputForwardRunnableTest.java
+ * Created on: Dec 3, 2016
+ */
+package fr.bigeon.gclc.tools;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import fr.bigeon.gclc.manager.PipedConsoleManager;
+
+/** <p>
+ * TODO
+ *
+ * @author Emmanuel Bigeon */
+public class AOutputForwardRunnableTest {
+
+    /** <p>
+     * TODO
+     *
+     * @author Emmanuel Bigeon */
+    private final class AOutputForwardTestRunnable
+            extends AOutputForwardRunnable {
+        private int count = 2;
+        private String message;
+
+        /** @param manager */
+        private AOutputForwardTestRunnable(PipedConsoleManager manager) {
+            super(manager);
+        }
+
+        @Override
+        protected boolean isRunning() {
+            return count != 0;
+        }
+
+        @Override
+        protected void forwardLine(String m) {
+            // Do nothing
+            message = m;
+            synchronized (this) {
+                notify();
+                try {
+                    wait();
+                } catch (InterruptedException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        /** @return the message */
+        public String getMessage() {
+            if (message == null) {
+                synchronized (this) {
+                    try {
+                        wait();
+                    } catch (InterruptedException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                }
+            }
+            String m = message;
+            count--;
+            message = null;
+            synchronized (this) {
+                notify();
+            }
+            return m;
+        }
+    }
+
+    /** Test method for
+     * {@link fr.bigeon.gclc.tools.AOutputForwardRunnable#run()}. */
+    @Test
+    public final void testRun() {
+        try (PipedConsoleManager manager = new PipedConsoleManager()) {
+            AOutputForwardTestRunnable runnable = new AOutputForwardTestRunnable(
+                    manager);
+
+            Thread th = new Thread(runnable, "forward");
+            manager.println("before");
+            th.start();
+
+            assertEquals("before", runnable.getMessage());
+
+            synchronized (this) {
+                wait(3000);
+            }
+            manager.println("after");
+            assertEquals("after", runnable.getMessage());
+            synchronized (this) {
+                wait(3000);
+            }
+
+            th.join();
+
+        } catch (IOException | InterruptedException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+}