diff --git a/gclc-socket/pom.xml b/gclc-socket/pom.xml index 2a5e062..139c97e 100644 --- a/gclc-socket/pom.xml +++ b/gclc-socket/pom.xml @@ -114,14 +114,14 @@ - fr.bigeon + net.bigeon gclc - 2.0.5 + 2.0.7 - fr.bigeon + net.bigeon smu - 0.0.9 + 1.0.0 diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/ConnexionManager.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/ConnexionManager.java similarity index 94% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/ConnexionManager.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/ConnexionManager.java index 9f61781..afd802d 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/ConnexionManager.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/ConnexionManager.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.ConnexionManager.java + * gclc-socket:net.bigeon.gclc.socket.ConnexionManager.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/DConnexionManager.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/DConnexionManager.java similarity index 85% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/DConnexionManager.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/DConnexionManager.java index aef855a..f6af241 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/DConnexionManager.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/DConnexionManager.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.DConnexionManager.java + * gclc-socket:net.bigeon.gclc.socket.DConnexionManager.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -69,7 +69,7 @@ public final class DConnexionManager implements ConnexionManager { } /* (non-Javadoc) * @see - * fr.bigeon.gclc.socket.ConnexionManager#addConnexion(java.lang.Object) */ + * net.bigeon.gclc.socket.ConnexionManager#addConnexion(java.lang.Object) */ @Override public String addConnexion(final T handle) { final String newID = newID(); @@ -81,7 +81,7 @@ public final class DConnexionManager implements ConnexionManager { /* (non-Javadoc) * @see - * fr.bigeon.gclc.socket.ConnexionManager#disconnect(java.lang.String) */ + * net.bigeon.gclc.socket.ConnexionManager#disconnect(java.lang.String) */ @Override public T disconnect(final String id) { if (connecteds.containsKey(id)) { @@ -106,14 +106,14 @@ public final class DConnexionManager implements ConnexionManager { } /* (non-Javadoc) - * @see fr.bigeon.gclc.socket.ConnexionManager#get(java.lang.String) */ + * @see net.bigeon.gclc.socket.ConnexionManager#get(java.lang.String) */ @Override public T get(final String id) { return connecteds.get(id); } /* (non-Javadoc) - * @see fr.bigeon.gclc.socket.ConnexionManager#getConnected() */ + * @see net.bigeon.gclc.socket.ConnexionManager#getConnected() */ @Override public Collection getConnected() { return connecteds.keySet(); @@ -121,7 +121,7 @@ public final class DConnexionManager implements ConnexionManager { /* (non-Javadoc) * @see - * fr.bigeon.gclc.socket.ConnexionManager#isConnected(java.lang.String) */ + * net.bigeon.gclc.socket.ConnexionManager#isConnected(java.lang.String) */ @Override public boolean isConnected(final String id) { return connecteds.containsKey(id); @@ -129,7 +129,7 @@ public final class DConnexionManager implements ConnexionManager { /* (non-Javadoc) * @see - * fr.bigeon.gclc.socket.ConnexionManager#lockDisconnexion(java.lang.String) */ + * net.bigeon.gclc.socket.ConnexionManager#lockDisconnexion(java.lang.String) */ @Override public void lockDisconnexion(final String id) { if (!connecteds.containsKey(id)) { @@ -149,7 +149,7 @@ public final class DConnexionManager implements ConnexionManager { /* (non-Javadoc) * @see - * fr.bigeon.gclc.socket.ConnexionManager#releaseDisconnexionLock(java.lang. + * net.bigeon.gclc.socket.ConnexionManager#releaseDisconnexionLock(java.lang. * String) */ @Override public void releaseDisconnexionLock(final String id) { @@ -162,7 +162,7 @@ public final class DConnexionManager implements ConnexionManager { /* (non-Javadoc) * @see - * fr.bigeon.gclc.socket.ConnexionManager#waitDisconnexion(java.lang.String) */ + * net.bigeon.gclc.socket.ConnexionManager#waitDisconnexion(java.lang.String) */ @Override public void waitDisconnexion(final String id) throws InterruptedException { final Object lock = locks.get(id); diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleInput.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java similarity index 94% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleInput.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java index 9086c72..8e5e34e 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleInput.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleInput.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.PlugableConsoleInput.java + * gclc-socket:net.bigeon.gclc.socket.PlugableConsoleInput.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -46,10 +46,10 @@ import java.nio.charset.StandardCharsets; import java.util.logging.Level; import java.util.logging.Logger; -import fr.bigeon.gclc.manager.ConsoleInput; -import fr.bigeon.gclc.manager.ReadingRunnable; -import fr.bigeon.gclc.tools.ConstantString; -import fr.bigeon.gclc.tools.StringProvider; +import net.bigeon.gclc.manager.ConsoleInput; +import net.bigeon.gclc.tools.ConstantString; +import net.bigeon.gclc.tools.StringProvider; +import net.bigeon.gclc.utils.ReadingRunnable; /** A console input where the stream can be plugged. *

diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleOutput.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleOutput.java similarity index 93% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleOutput.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleOutput.java index 86d7226..f346fef 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/PluggableConsoleOutput.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/PluggableConsoleOutput.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.PluggableConsoleOutput.java + * gclc-socket:net.bigeon.gclc.socket.PluggableConsoleOutput.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -42,7 +42,7 @@ import java.io.PrintStream; import java.util.ArrayDeque; import java.util.Deque; -import fr.bigeon.gclc.manager.ConsoleOutput; +import net.bigeon.gclc.manager.ConsoleOutput; /** An output that can be hotplugged to an actual output. * diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/RemoteDisconnectCommand.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/RemoteDisconnectCommand.java similarity index 89% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/RemoteDisconnectCommand.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/RemoteDisconnectCommand.java index 28b2b27..ea833d9 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/RemoteDisconnectCommand.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/RemoteDisconnectCommand.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.RemoteDisconnectCommand.java + * gclc-socket:net.bigeon.gclc.socket.RemoteDisconnectCommand.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -41,11 +41,11 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.Collection; -import fr.bigeon.gclc.command.Command; -import fr.bigeon.gclc.exception.CommandRunException; -import fr.bigeon.gclc.exception.CommandRunExceptionType; -import fr.bigeon.gclc.manager.ConsoleInput; -import fr.bigeon.gclc.manager.ConsoleOutput; +import net.bigeon.gclc.command.Command; +import net.bigeon.gclc.exception.CommandRunException; +import net.bigeon.gclc.exception.CommandRunExceptionType; +import net.bigeon.gclc.manager.ConsoleInput; +import net.bigeon.gclc.manager.ConsoleOutput; /** A {@link Command} to disconnect elements from a {@link ConnexionManager}. * @@ -109,7 +109,7 @@ public final class RemoteDisconnectCommand extends Command { } catch (final IOException e) { throw new CommandRunException( CommandRunExceptionType.INTERACTION, - "Unable to print to existing output", e, this); //$NON-NLS-1$ + "Unable to print to existing output", e); //$NON-NLS-1$ } } } diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleApplicationShell.java similarity index 96% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleApplicationShell.java index b981459..e362a9e 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleApplicationShell.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleApplicationShell.java @@ -1,4 +1,4 @@ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -41,7 +41,7 @@ import java.net.SocketException; import java.util.logging.Level; import java.util.logging.Logger; -import fr.bigeon.gclc.ConsoleApplication; +import net.bigeon.gclc.ConsoleApplication; /** This is a socket communicating console consoleManager. *

diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleInterface.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleInterface.java similarity index 94% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleInterface.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleInterface.java index 5fcc054..1b33950 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/SocketConsoleInterface.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/SocketConsoleInterface.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.SocketConsoleInterface.java + * gclc-socket:net.bigeon.gclc.socket.SocketConsoleInterface.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L diff --git a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/package-info.java b/gclc-socket/src/main/java/net/bigeon/gclc/socket/package-info.java similarity index 92% rename from gclc-socket/src/main/java/fr/bigeon/gclc/socket/package-info.java rename to gclc-socket/src/main/java/net/bigeon/gclc/socket/package-info.java index 263d1e4..e972f3b 100644 --- a/gclc-socket/src/main/java/fr/bigeon/gclc/socket/package-info.java +++ b/gclc-socket/src/main/java/net/bigeon/gclc/socket/package-info.java @@ -1,8 +1,8 @@ /** This package define a framework to access - * {@link fr.bigeon.gclc.ConsoleApplication} through a socket. + * {@link net.bigeon.gclc.ConsoleApplication} through a socket. * * @author Emmanuel Bigeon */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/ConsoleTestApplication.java similarity index 89% rename from gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java rename to gclc-socket/src/test/java/net/bigeon/gclc/socket/ConsoleTestApplication.java index 1894f34..d7b5c9e 100644 --- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/ConsoleTestApplication.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/ConsoleTestApplication.java @@ -1,4 +1,4 @@ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -37,14 +37,16 @@ import java.io.IOException; import java.net.Socket; import java.util.Collection; -import fr.bigeon.gclc.ConsoleApplication; -import fr.bigeon.gclc.command.Command; -import fr.bigeon.gclc.command.ExitCommand; -import fr.bigeon.gclc.command.HelpExecutor; -import fr.bigeon.gclc.exception.CommandRunException; -import fr.bigeon.gclc.exception.InvalidCommandName; -import fr.bigeon.gclc.manager.ConsoleInput; -import fr.bigeon.gclc.manager.ConsoleOutput; +import net.bigeon.gclc.ConsoleApplication; +import net.bigeon.gclc.command.Command; +import net.bigeon.gclc.command.HelpExecutor; +import net.bigeon.gclc.command.base.ExitCommand; +import net.bigeon.gclc.exception.CommandRunException; +import net.bigeon.gclc.exception.InvalidCommandName; +import net.bigeon.gclc.manager.ConsoleInput; +import net.bigeon.gclc.manager.ConsoleOutput; +import net.bigeon.gclc.socket.ConnexionManager; +import net.bigeon.gclc.socket.RemoteDisconnectCommand; /** A test-purpose application * @@ -95,8 +97,7 @@ public class ConsoleTestApplication { try { output.println("Test command ran fine"); } catch (final IOException e) { - throw new CommandRunException("manager closed", e, - this); + throw new CommandRunException("manager closed", e); } } @@ -129,8 +130,7 @@ public class ConsoleTestApplication { Thread.sleep(2000); output.println("Test command ran fine"); } catch (IOException | InterruptedException e) { - throw new CommandRunException("manager closed", e, - this); + throw new CommandRunException("manager closed", e); } } diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/PluggableConsoleInputTest.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java similarity index 92% rename from gclc-socket/src/test/java/fr/bigeon/gclc/socket/PluggableConsoleInputTest.java rename to gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java index c81bcc9..98aa697 100644 --- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/PluggableConsoleInputTest.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/PluggableConsoleInputTest.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.PluggableConsoleInputTest.java + * gclc-socket:net.bigeon.gclc.socket.PluggableConsoleInputTest.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -49,6 +49,8 @@ import java.io.PrintStream; import org.junit.Test; +import net.bigeon.gclc.socket.PluggableConsoleInput; + /** *

* TODO @@ -57,7 +59,7 @@ import org.junit.Test; public class PluggableConsoleInputTest { /** Test method for - * {@link fr.bigeon.gclc.socket.PluggableConsoleInput#close()}. */ + * {@link net.bigeon.gclc.socket.PluggableConsoleInput#close()}. */ @Test public final void testClose() { final PluggableConsoleInput input = new PluggableConsoleInput(); @@ -191,7 +193,7 @@ public class PluggableConsoleInputTest { } /** Test method for - * {@link fr.bigeon.gclc.socket.PluggableConsoleInput#getPrompt()}. */ + * {@link net.bigeon.gclc.socket.PluggableConsoleInput#getPrompt()}. */ @Test public final void testGetPrompt() { final PluggableConsoleInput input = new PluggableConsoleInput(); diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/RemoteDisconnectCommandTest.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/RemoteDisconnectCommandTest.java similarity index 86% rename from gclc-socket/src/test/java/fr/bigeon/gclc/socket/RemoteDisconnectCommandTest.java rename to gclc-socket/src/test/java/net/bigeon/gclc/socket/RemoteDisconnectCommandTest.java index 4551513..26fe596 100644 --- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/RemoteDisconnectCommandTest.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/RemoteDisconnectCommandTest.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.RemoteDisconnectCommandTest.java + * gclc-socket:net.bigeon.gclc.socket.RemoteDisconnectCommandTest.java * Created on: Nov 18, 2017 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -45,8 +45,10 @@ import java.io.IOException; import org.junit.Test; -import fr.bigeon.gclc.exception.CommandRunException; -import fr.bigeon.gclc.manager.PipedConsoleOutput; +import net.bigeon.gclc.exception.CommandRunException; +import net.bigeon.gclc.socket.DConnexionManager; +import net.bigeon.gclc.socket.RemoteDisconnectCommand; +import net.bigeon.gclc.utils.PipedConsoleOutput; /** *

@@ -56,7 +58,7 @@ import fr.bigeon.gclc.manager.PipedConsoleOutput; public class RemoteDisconnectCommandTest { /** Test method for - * {@link fr.bigeon.gclc.socket.RemoteDisconnectCommand#execute(fr.bigeon.gclc.manager.ConsoleOutput, fr.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}. + * {@link net.bigeon.gclc.socket.RemoteDisconnectCommand#execute(net.bigeon.gclc.manager.ConsoleOutput, net.bigeon.gclc.manager.ConsoleInput, java.lang.String[])}. * * @throws CommandRunException if the command unexpectedly failed. * @throws IOException if the output could not be written to */ diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/SocketConsoleApplicationTest.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/SocketConsoleApplicationTest.java similarity index 94% rename from gclc-socket/src/test/java/fr/bigeon/gclc/socket/SocketConsoleApplicationTest.java rename to gclc-socket/src/test/java/net/bigeon/gclc/socket/SocketConsoleApplicationTest.java index 37cb7c5..23955a1 100644 --- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/SocketConsoleApplicationTest.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/SocketConsoleApplicationTest.java @@ -1,8 +1,8 @@ /** - * gclc-socket:fr.bigeon.gclc.socket.SocketConsoleApplicationTest.java + * gclc-socket:net.bigeon.gclc.socket.SocketConsoleApplicationTest.java * Created on: Jun 1, 2016 */ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -48,6 +48,8 @@ import java.util.logging.Logger; import org.junit.Test; +import net.bigeon.gclc.socket.SocketConsoleApplicationShell; + /** Test class for {@link SocketConsoleApplicationShell} * * @author Emmanuel Bigeon */ diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestConsoleClient.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/TestConsoleClient.java similarity index 95% rename from gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestConsoleClient.java rename to gclc-socket/src/test/java/net/bigeon/gclc/socket/TestConsoleClient.java index 0afcd3e..097a596 100644 --- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestConsoleClient.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/TestConsoleClient.java @@ -1,4 +1,4 @@ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -41,7 +41,7 @@ import java.net.Socket; import java.util.ArrayList; import java.util.Collection; -import fr.bigeon.smu.StringEncoder; +import net.bigeon.smu.StringEncoder; /** TODO Describe TestConsoleClient.java * @author Emmanuel Bigeon diff --git a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java b/gclc-socket/src/test/java/net/bigeon/gclc/socket/TestServer.java similarity index 87% rename from gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java rename to gclc-socket/src/test/java/net/bigeon/gclc/socket/TestServer.java index 86c1f1a..ec7c3b7 100644 --- a/gclc-socket/src/test/java/fr/bigeon/gclc/socket/TestServer.java +++ b/gclc-socket/src/test/java/net/bigeon/gclc/socket/TestServer.java @@ -1,4 +1,4 @@ -package fr.bigeon.gclc.socket; +package net.bigeon.gclc.socket; /*- * #%L @@ -38,7 +38,13 @@ import java.net.InetAddress; import java.net.Socket; import java.net.UnknownHostException; -import fr.bigeon.gclc.ConsoleApplication; +import net.bigeon.gclc.ConsoleApplication; +import net.bigeon.gclc.socket.ConnexionManager; +import net.bigeon.gclc.socket.DConnexionManager; +import net.bigeon.gclc.socket.PluggableConsoleInput; +import net.bigeon.gclc.socket.PluggableConsoleOutput; +import net.bigeon.gclc.socket.SocketConsoleApplicationShell; +import net.bigeon.gclc.socket.SocketConsoleInterface; /** A test server *