Merge mqttv5 modules client and common

Signed-off-by: Ranjan-Dasgupta <Ranjan.Dasgupta@us.ibm.com>

Author: Ranjan-Dasgupta

org.eclipse.paho.client.mqttv3/META-INF/MANIFEST.MF

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %bundle.name
+Bundle-Name: org.eclipse.paho.client.mqttv3
 Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
 Bundle-Version: 1.2.5.qualifier
 Bundle-Localization: bundle

org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

@@ -93,6 +93,7 @@ public class ClientComms {
 	 * @param persistence the {@link MqttClientPersistence} layer.
 	 * @param pingSender the {@link MqttPingSender}
 	 * @param executorService the {@link ExecutorService}
+	 * @param highResolutionTimer the {@link HighResolutionTimer}
 	 * @throws MqttException if an exception occurs whilst communicating with the server
 	 */
 	public ClientComms(IMqttAsyncClient client, MqttClientPersistence persistence, MqttPingSender pingSender,

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/CommsReceiver.java

@@ -168,7 +168,7 @@ public void run() {
 						}  
                                                 else {
                                                     // fix for bug 719
-                                                    if (!clientComms.isConnected()) {
+                                                    if (!clientComms.isConnected() && !clientComms.isConnecting()) {
                                                          throw new IOException("Connection is lost.");
                                                     }
                                                 }

org.eclipse.paho.mqttv5.client.test/pom.xml

@@ -27,11 +27,6 @@
             <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.mqttv5.common</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.mqttv5.client</artifactId>

org.eclipse.paho.mqttv5.client/pom.xml

@@ -14,11 +14,6 @@
     <name>org.eclipse.paho.mqttv5.client</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.mqttv5.common</artifactId>
-            <version>1.2.5-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

…/paho/mqttv5/common/ExceptionHelper.java …/paho/mqttv5/common/ExceptionHelper.javaorg.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java renamed to org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java renamed to org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java

@@ -57,6 +57,9 @@ public MqttException(int reasonCode) {
 	 * meant as a hint for the developer, as the
 	 * <code>MqttCallback.disconnected</code> callback is the intended disconnect
 	 * notification mechanism.
+         *
+	 * @param reasonCode   the reason code for the exception.
+	 * @param disconnect   diconnect flag
 	 */
 	public MqttException(int reasonCode, MqttDisconnect disconnect) {
 		super();