[maven-release-plugin] prepare release gclc-socket-1.1.6

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.5</version>
+  <version>1.1.6</version>
   <packaging>jar</packaging>
   <url>http://www.bigeon.fr/emmanuel</url>
   <properties>
@@ -78,12 +78,6 @@ 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>
@@ -104,6 +98,6 @@ of Emmanuel Bigeon.                                                   -->
   <description>Socket implementation of GCLC</description>
   <scm>
     <developerConnection>scm:git:gogs@git.code.bigeon.net:emmanuel/gclc.git</developerConnection>
-    <tag>gclc-socket-1.1.5</tag>
+    <tag>gclc-socket-1.1.6</tag>
   </scm>
 </project>

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

@@ -95,12 +95,12 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         @Override
         public void run() {
             try {
-                while (!socket.isOutputShutdown()) {
+                while (!socket.isClosed()) {
-                    while (!socket.isOutputShutdown() &&
+                    while (!socket.isClosed() &&
                            !consoleManager.available()) {
                         waitASec();
                     }
-                    if (socket.isOutputShutdown()) {
+                    if (socket.isClosed()) {
                         return;
                     }
                     String m = consoleManager.readNextLine();
@@ -266,7 +266,6 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
             communicateOnce(socket, in);
         } else {
             communicateLoop(socket, in);
-
         }
     }
 
@@ -279,8 +278,21 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         Thread th = new Thread(reading, "gclcToApp"); //$NON-NLS-1$
         th.start();
         communicationContent(reading);
+        doEndCommunication(reading);
+    }
+
+    /** @param reading the reading runnable
+     * @throws IOException if the end of communication failed */
+    private void doEndCommunication(ReadingRunnable reading) throws IOException {
         reading.setRunning(false);
-        socket.shutdownOutput();
+        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 socket the socket
@@ -294,12 +306,7 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         while (app.isRunning() && communicationContent(reading)) {
             // keep on going
         }
-        reading.setRunning(false);
+        doEndCommunication(reading);
-        while (consoleManager.available()) {
-            waitASec();
-        }
-        socket.shutdownOutput();
-
     }
 
     /** @param reading the reading
@@ -322,14 +329,6 @@ public class SocketConsoleApplicationShell implements Runnable, AutoCloseable {
         }
         String ln = reading.getMessage();
         if (ln.equals(close)) {
-            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$
-            }
             return false;
         }
         // Pass command to application

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

@@ -89,17 +89,10 @@ public class SocketConsoleApplicationTest {
             String[] cmds = {"help", "toto", "test", "bye"};
             while ((fromServer = in.readLine()) != null) {
                 i++;
-                LOGGER.fine("Server: \n" + fromServer);
+                fromServer = consumeToPrompt(fromServer, in);
-                if (fromServer.equals("Bye.")) {
+                if (fromServer == null || fromServer.equals("Bye.")) {
                     break;
                 }
-                while (fromServer != null && !fromServer.equals("> ")) {
-                    fromServer = in.readLine();
-                    LOGGER.fine("Server: \n" + fromServer);
-                }
-                if (fromServer == null) {
-                    fail("Null pointer");
-                }
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
@@ -123,19 +116,15 @@ public class SocketConsoleApplicationTest {
             String[] cmds = {"help", "toto", "test",
                     ConsoleTestApplication.EXIT};
             while ((fromServer = in.readLine()) != null) {
-                LOGGER.fine("Server: \n" + fromServer);
+                fromServer = consumeToPrompt(fromServer, in);
-                while (fromServer != null && !fromServer.equals("> ")) {
+                if (fromServer == null || fromServer.equals("Bye.")) {
-                    LOGGER.fine("Server: \n" + fromServer);
-                    fromServer = in.readLine();
-                }
-                if (fromServer == null) {
                     break;
                 }
-                LOGGER.fine("Server: \n" + fromServer);
+                LOGGER.info("Server: \n" + fromServer);
 
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
-                    LOGGER.fine("Client: " + fromUser);
+                    LOGGER.info("Client: " + fromUser);
                     out.println(fromUser);
                 }
                 i++;
@@ -161,11 +150,8 @@ public class SocketConsoleApplicationTest {
             String[] cmds = {"help", "toto", "test",
                     ConsoleTestApplication.EXIT};
             while ((fromServer = in.readLine()) != null) {
-                while (fromServer != null && !fromServer.equals("> ")) {
+                fromServer = consumeToPrompt(fromServer, in);
-                    fromServer = in.readLine();
+                if (fromServer == null || fromServer.equals("Bye.")) {
-                    LOGGER.fine("Server: \n" + fromServer);
-                }
-                if (fromServer == null) {
                     break;
                 }
 
@@ -207,17 +193,11 @@ public class SocketConsoleApplicationTest {
             int i = 0;
             String[] cmds = {"help", "test", "close"};
             while ((fromServer = in.readLine()) != null) {
-                assertTrue(i < 1);
+                fromServer = consumeToPrompt(fromServer, in);
-                while (fromServer != null && !fromServer.equals("> ") &&
+                if (fromServer == null || fromServer.equals("Bye.")) {
-                       !fromServer.equals("See you")) {
-                    fromServer = in.readLine();
-                    LOGGER.fine("Server: \n" + fromServer);
-                }
-                if (fromServer == null || fromServer.equals("Bye.") ||
-                    fromServer.equals("See you")) {
                     break;
                 }
-
+                assertTrue(i < 1);
                 final String fromUser = cmds[i];
                 if (fromUser != null) {
                     LOGGER.fine("Client: " + fromUser);
@@ -243,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

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>fr.bigeon</groupId>
       <artifactId>gclc</artifactId>
-      <version>1.3.2</version>
+      <version>1.3.3</version>
     </dependency>
     <dependency>
       <groupId>fr.bigeon</groupId>