Skip to content

Commit

Permalink
Merge branch 'development' for 0.1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilfb committed May 31, 2015
2 parents da08040 + 3b888eb commit e0b24a6
Show file tree
Hide file tree
Showing 48 changed files with 3,599 additions and 67 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 1 addition & 0 deletions mqtt-spy-common/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
14 changes: 10 additions & 4 deletions mqtt-spy-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -303,4 +309,4 @@

</build>

</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
* &lt;element name="CleanSession" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
* &lt;element name="ConnectionTimeout" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
* &lt;element name="KeepAliveInterval" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
* &lt;element name="SSL" type="{http://baczkowicz.pl/mqtt-spy/common}SslSettings" minOccurs="0"/>
* &lt;element name="ReconnectionSettings" type="{http://baczkowicz.pl/mqtt-spy/common}ReconnectionSettings" minOccurs="0"/>
* &lt;/sequence>
* &lt;/extension>
Expand All @@ -68,6 +69,7 @@
"cleanSession",
"connectionTimeout",
"keepAliveInterval",
"ssl",
"reconnectionSettings"
})
public class MqttConnectionDetails
Expand All @@ -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;

Expand All @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -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.
*
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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());
}

Expand All @@ -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());
}

Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
*
Expand All @@ -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 }
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}

}
Loading

0 comments on commit e0b24a6

Please sign in to comment.