Skip to content

Commit 5341eb3

Browse files
author
Ranjan Dasgupta
authored
Merge pull request #797 from rdasgupt/develop
Merge MQTTv5 common module into client
2 parents 3e3b6c4 + 28451bc commit 5341eb3

90 files changed

Lines changed: 201 additions & 105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ before_install:
1414
script:
1515
- mvn -B clean -q
1616
- mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
17-
- mvn -B --projects org.eclipse.paho.mqttv5.common,org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
17+
- mvn -B --projects org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
1818

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
3-
Bundle-Name: %bundle.name
3+
Bundle-Name: org.eclipse.paho.client.mqttv3
44
Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
55
Bundle-Version: 1.2.5.qualifier
66
Bundle-Localization: bundle

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public class ClientComms {
9393
* @param persistence the {@link MqttClientPersistence} layer.
9494
* @param pingSender the {@link MqttPingSender}
9595
* @param executorService the {@link ExecutorService}
96+
* @param highResolutionTimer the {@link HighResolutionTimer}
9697
* @throws MqttException if an exception occurs whilst communicating with the server
9798
*/
9899
public ClientComms(IMqttAsyncClient client, MqttClientPersistence persistence, MqttPingSender pingSender,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void run() {
168168
}
169169
else {
170170
// fix for bug 719
171-
if (!clientComms.isConnected()) {
171+
if (!clientComms.isConnected() && !clientComms.isConnecting()) {
172172
throw new IOException("Connection is lost.");
173173
}
174174
}

‎org.eclipse.paho.mqttv5.client.repository/category.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<bundle id="org.eclipse.paho.mqttv5.client" version="1.2.5.qualifier">
4+
<category name="Paho MQTT Java"/>
5+
</bundle>
6+
<category-def name="Paho MQTT Java" label="Paho MQTT Java">
7+
<description>
8+
The Eclipse Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things (IoT).
9+
</description>
10+
</category-def>
11+
</site>

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<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/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>org.eclipse.paho</groupId>
5+
<artifactId>java-parent</artifactId>
6+
<version>1.2.5-SNAPSHOT</version>
7+
</parent>
8+
9+
<artifactId>org.eclipse.paho.mqttv5.client.repository</artifactId>
10+
<version>1.2.5-SNAPSHOT</version>
11+
<packaging>eclipse-repository</packaging>
12+
13+
<name>Paho P2 Repository</name>
14+
15+
<build>
16+
<plugins>
17+
<plugin>
18+
<groupId>org.eclipse.tycho</groupId>
19+
<artifactId>tycho-maven-plugin</artifactId>
20+
</plugin>
21+
<plugin>
22+
<artifactId>maven-antrun-plugin</artifactId>
23+
<executions>
24+
<execution>
25+
<id>deploy</id>
26+
<phase>deploy</phase>
27+
<goals>
28+
<goal>run</goal>
29+
</goals>
30+
<configuration>
31+
<tasks>
32+
<delete includeemptydirs="false" quiet="true">
33+
<fileset dir="${download.location}">
34+
<include name="**" />
35+
</fileset>
36+
</delete>
37+
<copy includeemptydirs="false" todir="${download.location}">
38+
<fileset dir="${project.build.directory}/repository/">
39+
<include name="**" />
40+
</fileset>
41+
</copy>
42+
</tasks>
43+
</configuration>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
<!-- <plugin>
48+
<groupId>org.eclipse.tycho.extras</groupId>
49+
<artifactId>tycho-p2-extras-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>update-main-p2-repo</id>
53+
<phase>package</phase>
54+
<goals>
55+
<goal>publish-features-and-bundles</goal>
56+
</goals>
57+
<configuration>
58+
<append>true</append>
59+
<artifactRepositoryLocation>/shared/technology/paho/Java</artifactRepositoryLocation>
60+
<metadataRepositoryLocation>/shared/technology/paho/Java</metadataRepositoryLocation>
61+
<sourceLocation>${project.build.directory}/repository</sourceLocation>
62+
</configuration>
63+
</execution>
64+
</executions>
65+
</plugin> -->
66+
</plugins>
67+
</build>
68+
</project>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<version>3.8.1</version>
2828
<scope>test</scope>
2929
</dependency>
30-
<dependency>
31-
<groupId>org.eclipse.paho</groupId>
32-
<artifactId>org.eclipse.paho.mqttv5.common</artifactId>
33-
<version>1.2.5-SNAPSHOT</version>
34-
</dependency>
3530
<dependency>
3631
<groupId>org.eclipse.paho</groupId>
3732
<artifactId>org.eclipse.paho.mqttv5.client</artifactId>

‎org.eclipse.paho.mqttv5.client/META-INF/MANIFEST.MF‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: org.eclipse.paho.mqttv5.client
4+
Bundle-SymbolicName: org.eclipse.paho.mqttv5.client
5+
Bundle-Version: 1.2.5.qualifier
6+
Bundle-Localization: bundle
7+
Export-Package: org.eclipse.paho.mqttv5.client;version="1.2.5.qualifier"
8+
Bundle-Vendor: %bundle.provider
9+
Bundle-ActivationPolicy: lazy
10+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
11+
Import-Package: javax.net;resolution:=optional,
12+
javax.net.ssl;resolution:=optional

‎org.eclipse.paho.mqttv5.client/build.properties‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source.. = src/main/resources/,\
2+
src/main/java/
3+
bin.includes = META-INF/,\
4+
.

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

Lines changed: 82 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212

1313
<artifactId>org.eclipse.paho.mqttv5.client</artifactId>
1414
<name>org.eclipse.paho.mqttv5.client</name>
15+
<packaging>eclipse-plugin</packaging>
1516

1617
<dependencies>
17-
<dependency>
18-
<groupId>org.eclipse.paho</groupId>
19-
<artifactId>org.eclipse.paho.mqttv5.common</artifactId>
20-
<version>1.2.5-SNAPSHOT</version>
21-
</dependency>
2218
<dependency>
2319
<groupId>junit</groupId>
2420
<artifactId>junit</artifactId>
@@ -48,6 +44,25 @@
4844
</executions>
4945
</plugin>
5046

47+
<plugin>
48+
<groupId>org.eclipse.tycho</groupId>
49+
<artifactId>tycho-maven-plugin</artifactId>
50+
</plugin>
51+
52+
<plugin>
53+
<groupId>org.codehaus.mojo</groupId>
54+
<artifactId>templating-maven-plugin</artifactId>
55+
<version>1.0.0</version>
56+
<executions>
57+
<execution>
58+
<id>filter-src</id>
59+
<goals>
60+
<goal>filter-sources</goal>
61+
</goals>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
5166
<!--
5267
Submit code coverage report to coveralls.io
5368
https://coveralls.io/github/ibm-watson-iot/iot-java
@@ -74,36 +89,89 @@
7489

7590
<plugin>
7691
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-javadoc-plugin</artifactId>
78-
<version>${javadoc.version}</version>
92+
<artifactId>maven-resources-plugin</artifactId>
93+
<version>3.0.2</version>
7994
<executions>
8095
<execution>
81-
<id>attach-javadocs</id>
96+
<id>default-copy-resources</id>
97+
<phase>process-resources</phase>
8298
<goals>
83-
<goal>javadoc-no-fork</goal>
84-
<goal>jar</goal>
99+
<goal>copy-resources</goal>
85100
</goals>
86101
<configuration>
87-
<additionalparam>${javadoc.opts}</additionalparam>
102+
<overwrite>true</overwrite>
103+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
104+
<resources>
105+
<resource>
106+
<!-- used in modules which relative to its parent -->
107+
<directory>../</directory>
108+
<includes>
109+
<include>about.html</include>
110+
</includes>
111+
</resource>
112+
</resources>
88113
</configuration>
89114
</execution>
90115
</executions>
91116
</plugin>
92117

93118
<plugin>
94119
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-source-plugin</artifactId>
96-
<version>${mvnsource.version}</version>
120+
<artifactId>maven-javadoc-plugin</artifactId>
121+
<version>${javadoc.version}</version>
97122
<executions>
98123
<execution>
99-
<id>attach-sources</id>
124+
<id>attach-javadocs</id>
100125
<goals>
126+
<goal>javadoc-no-fork</goal>
101127
<goal>jar</goal>
102128
</goals>
129+
<configuration>
130+
<additionalparam>${javadoc.opts}</additionalparam>
131+
</configuration>
103132
</execution>
104133
</executions>
105134
</plugin>
135+
106136
</plugins>
137+
138+
<pluginManagement>
139+
<plugins>
140+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the M
141+
aven build itself.-->
142+
<plugin>
143+
<groupId>org.eclipse.m2e</groupId>
144+
<artifactId>lifecycle-mapping</artifactId>
145+
<version>1.0.0</version>
146+
<configuration>
147+
<lifecycleMappingMetadata>
148+
<pluginExecutions>
149+
<pluginExecution>
150+
<pluginExecutionFilter>
151+
<groupId>
152+
org.codehaus.mojo
153+
</groupId>
154+
<artifactId>
155+
templating-maven-plugin
156+
</artifactId>
157+
<versionRange>
158+
[1.0-alpha-3,)
159+
</versionRange>
160+
<goals>
161+
<goal>filter-sources</goal>
162+
</goals>
163+
</pluginExecutionFilter>
164+
<action>
165+
<ignore />
166+
</action>
167+
</pluginExecution>
168+
</pluginExecutions>
169+
</lifecycleMappingMetadata>
170+
</configuration>
171+
</plugin>
172+
</plugins>
173+
</pluginManagement>
174+
107175
</build>
108176
</project>
109177

0 commit comments

Comments
 (0)