Merge branch 'development' for 0.1.11

README.md

@@ -12,4 +12,4 @@ The branching model (not fully in place yet) is as follows*:
 
 \* - this has been heavily influenced by http://nvie.com/posts/a-successful-git-branching-model/.
 
-The eclipse_paho_contribution branch is what was submitted to the Eclipse Paho project in https://bugs.eclipse.org/bugs/show_bug.cgi?id=458899.
+The eclipse_paho tags is what was submitted to the Eclipse Paho project in https://bugs.eclipse.org/bugs/show_bug.cgi?id=458899.

mqtt-spy-common/.classpath

@@ -6,6 +6,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>

mqtt-spy-common/pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>pl.baczkowicz.mqttspy</groupId>
 	<artifactId>mqtt-spy-common</artifactId>
-	<version>0.0.9</version>
+	<version>0.0.10</version>
 
   	<properties>
   		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  		
@@ -40,7 +40,13 @@
 			<artifactId>commons-codec</artifactId>
 			<version>1.9</version>
 		</dependency>
-
+
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.52</version>
+		</dependency>
+
 		<!-- Old MQTT client dependency, deprecated 
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
@@ -72,7 +78,7 @@
 			<groupId>org.dna.mqtt</groupId>
 			<artifactId>moquette-broker</artifactId>
 			<scope>compile</scope>
-			<version>0.5</version>
+			<version>0.6</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -303,4 +309,4 @@
 
 	</build>
 
-</project>
+</project>

mqtt-spy-common/src/main/java/pl/baczkowicz/mqttspy/common/generated/MqttConnectionDetails.java

@@ -49,6 +49,7 @@
  *         <element name="CleanSession" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
  *         <element name="ConnectionTimeout" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
  *         <element name="KeepAliveInterval" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
+ *         <element name="SSL" type="{http://baczkowicz.pl/mqtt-spy/common}SslSettings" minOccurs="0"/>
  *         <element name="ReconnectionSettings" type="{http://baczkowicz.pl/mqtt-spy/common}ReconnectionSettings" minOccurs="0"/>
  *       </sequence>
  *     </extension>
@@ -68,6 +69,7 @@
     "cleanSession",
     "connectionTimeout",
     "keepAliveInterval",
+    "ssl",
     "reconnectionSettings"
 })
 public class MqttConnectionDetails
@@ -89,6 +91,8 @@ public class MqttConnectionDetails
     protected Integer connectionTimeout;
     @XmlElement(name = "KeepAliveInterval")
     protected Integer keepAliveInterval;
+    @XmlElement(name = "SSL")
+    protected SslSettings ssl;
     @XmlElement(name = "ReconnectionSettings")
     protected ReconnectionSettings reconnectionSettings;
 
@@ -104,7 +108,7 @@ public MqttConnectionDetails() {
      * Fully-initialising value constructor
      * 
      */
-    public MqttConnectionDetails(final String name, final ProtocolEnum protocol, final List<String> serverURI, final String clientID, final UserCredentials userCredentials, final SimpleMqttMessage lastWillAndTestament, final Boolean cleanSession, final Integer connectionTimeout, final Integer keepAliveInterval, final ReconnectionSettings reconnectionSettings) {
+    public MqttConnectionDetails(final String name, final ProtocolEnum protocol, final List<String> serverURI, final String clientID, final UserCredentials userCredentials, final SimpleMqttMessage lastWillAndTestament, final Boolean cleanSession, final Integer connectionTimeout, final Integer keepAliveInterval, final SslSettings ssl, final ReconnectionSettings reconnectionSettings) {
         super(name, protocol);
         this.serverURI = serverURI;
         this.clientID = clientID;
@@ -113,6 +117,7 @@ public MqttConnectionDetails(final String name, final ProtocolEnum protocol, fin
         this.cleanSession = cleanSession;
         this.connectionTimeout = connectionTimeout;
         this.keepAliveInterval = keepAliveInterval;
+        this.ssl = ssl;
         this.reconnectionSettings = reconnectionSettings;
     }
 
@@ -289,6 +294,30 @@ public void setKeepAliveInterval(Integer value) {
         this.keepAliveInterval = value;
     }
 
+    /**
+     * Gets the value of the ssl property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SslSettings }
+     *     
+     */
+    public SslSettings getSSL() {
+        return ssl;
+    }
+
+    /**
+     * Sets the value of the ssl property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SslSettings }
+     *     
+     */
+    public void setSSL(SslSettings value) {
+        this.ssl = value;
+    }
+
     /**
      * Gets the value of the reconnectionSettings property.
      * 
@@ -350,6 +379,11 @@ public void toString(ToStringBuilder toStringBuilder) {
             theKeepAliveInterval = this.getKeepAliveInterval();
             toStringBuilder.append("keepAliveInterval", theKeepAliveInterval);
         }
+        {
+            SslSettings theSSL;
+            theSSL = this.getSSL();
+            toStringBuilder.append("ssl", theSSL);
+        }
         {
             ReconnectionSettings theReconnectionSettings;
             theReconnectionSettings = this.getReconnectionSettings();
@@ -380,6 +414,7 @@ public void equals(Object object, EqualsBuilder equalsBuilder) {
         equalsBuilder.append(this.isCleanSession(), that.isCleanSession());
         equalsBuilder.append(this.getConnectionTimeout(), that.getConnectionTimeout());
         equalsBuilder.append(this.getKeepAliveInterval(), that.getKeepAliveInterval());
+        equalsBuilder.append(this.getSSL(), that.getSSL());
         equalsBuilder.append(this.getReconnectionSettings(), that.getReconnectionSettings());
     }
 
@@ -404,6 +439,7 @@ public void hashCode(HashCodeBuilder hashCodeBuilder) {
         hashCodeBuilder.append(this.isCleanSession());
         hashCodeBuilder.append(this.getConnectionTimeout());
         hashCodeBuilder.append(this.getKeepAliveInterval());
+        hashCodeBuilder.append(this.getSSL());
         hashCodeBuilder.append(this.getReconnectionSettings());
     }
 
@@ -460,6 +496,12 @@ public Object copyTo(Object target, CopyBuilder copyBuilder) {
             Integer copyKeepAliveInterval = ((Integer) copyBuilder.copy(sourceKeepAliveInterval));
             copy.setKeepAliveInterval(copyKeepAliveInterval);
         }
+        {
+            SslSettings sourceSSL;
+            sourceSSL = this.getSSL();
+            SslSettings copySSL = ((SslSettings) copyBuilder.copy(sourceSSL));
+            copy.setSSL(copySSL);
+        }
         {
             ReconnectionSettings sourceReconnectionSettings;
             sourceReconnectionSettings = this.getReconnectionSettings();

mqtt-spy-common/src/main/java/pl/baczkowicz/mqttspy/common/generated/ObjectFactory.java

@@ -84,6 +84,14 @@ public SimpleMqttMessage createSimpleMqttMessage() {
         return new SimpleMqttMessage();
     }
 
+    /**
+     * Create an instance of {@link SslProperty }
+     * 
+     */
+    public SslProperty createSslProperty() {
+        return new SslProperty();
+    }
+
     /**
      * Create an instance of {@link MqttConnectionDetails }
      * 
@@ -100,6 +108,14 @@ public SubscriptionDetails createSubscriptionDetails() {
         return new SubscriptionDetails();
     }
 
+    /**
+     * Create an instance of {@link SslSettings }
+     * 
+     */
+    public SslSettings createSslSettings() {
+        return new SslSettings();
+    }
+
     /**
      * Create an instance of {@link MessageLog }
      * 

mqtt-spy-common/src/main/java/pl/baczkowicz/mqttspy/common/generated/SslModeEnum.java

@@ -0,0 +1,53 @@
+//
+// Copyright (c) 2015 Kamil Baczkowicz
+//
+// CSOFF: a.*
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Timestamp removed by maven-replacer-plugin to avoid detecting changes - see the project POM for details
+//
+
+
+package pl.baczkowicz.mqttspy.common.generated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for SslModeEnum.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="SslModeEnum">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="DISABLED"/>
+ *     &lt;enumeration value="SERVER_ONLY"/>
+ *     &lt;enumeration value="SERVER_AND_CLIENT"/>
+ *     &lt;enumeration value="PROPERTIES"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+*/
+@SuppressWarnings("all")
+@XmlType(name = "SslModeEnum")
+@XmlEnum
+public enum SslModeEnum {
+
+    DISABLED,
+    SERVER_ONLY,
+    SERVER_AND_CLIENT,
+    PROPERTIES;
+
+    public String value() {
+        return name();
+    }
+
+    public static SslModeEnum fromValue(String v) {
+        return valueOf(v);
+    }
+
+}