diff --git a/Android.bp b/Android.bp
index 9a35d03..d757f03 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,16 +1,11 @@
-java_library_static {
- name: "libmqttv5",
+android_app {
+ name: "SystemMqttService",
srcs: [
- "src/main/java/org/eclipse/paho/mqttv5/client/**/*.java",
- "src/main/java/org/eclipse/paho/mqttv5/common/**/*.java",
- "src/main/java/org/eclipse/paho/mqttv5/internal/**/*.java",
- "src/main/java/org/eclipse/paho/mqttv5/util/**/*.java",
- ],
- javac_flags: [
- "-Xlint:all",
- "-Werror",
- ],
- visibility: [
- "//frameworks/base/services/core",
+ "src/**/*.java",
+ "mqtt/**/*.java", // 这里把 MQTT v5 源码编译进去
],
+ platform_apis: true,
+ privileged: true, // 安装到 /system/priv-app
+ certificate: "platform", // 用 platform key 签名，拿到系统权限
+ sdk_version: "system_current",
}
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 0000000..594f6fe
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/BufferedMessage.java b/mqtt/org/eclipse/paho/mqttv5/client/BufferedMessage.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/BufferedMessage.java
rename to mqtt/org/eclipse/paho/mqttv5/client/BufferedMessage.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/ConnectCallback.java b/mqtt/org/eclipse/paho/mqttv5/client/ConnectCallback.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/ConnectCallback.java
rename to mqtt/org/eclipse/paho/mqttv5/client/ConnectCallback.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/ConnectionLostCallback.java b/mqtt/org/eclipse/paho/mqttv5/client/ConnectionLostCallback.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/ConnectionLostCallback.java
rename to mqtt/org/eclipse/paho/mqttv5/client/ConnectionLostCallback.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/ConnectionRecoveredCallback.java b/mqtt/org/eclipse/paho/mqttv5/client/ConnectionRecoveredCallback.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/ConnectionRecoveredCallback.java
rename to mqtt/org/eclipse/paho/mqttv5/client/ConnectionRecoveredCallback.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/DisconnectedBufferOptions.java b/mqtt/org/eclipse/paho/mqttv5/client/DisconnectedBufferOptions.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/DisconnectedBufferOptions.java
rename to mqtt/org/eclipse/paho/mqttv5/client/DisconnectedBufferOptions.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/FunctionalMqttClient.java b/mqtt/org/eclipse/paho/mqttv5/client/FunctionalMqttClient.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/FunctionalMqttClient.java
rename to mqtt/org/eclipse/paho/mqttv5/client/FunctionalMqttClient.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/IMqttAsyncClient.java b/mqtt/org/eclipse/paho/mqttv5/client/IMqttAsyncClient.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/IMqttAsyncClient.java
rename to mqtt/org/eclipse/paho/mqttv5/client/IMqttAsyncClient.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/IMqttClient.java b/mqtt/org/eclipse/paho/mqttv5/client/IMqttClient.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/IMqttClient.java
rename to mqtt/org/eclipse/paho/mqttv5/client/IMqttClient.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/IMqttDeliveryToken.java b/mqtt/org/eclipse/paho/mqttv5/client/IMqttDeliveryToken.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/IMqttDeliveryToken.java
rename to mqtt/org/eclipse/paho/mqttv5/client/IMqttDeliveryToken.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/IMqttMessageListener.java b/mqtt/org/eclipse/paho/mqttv5/client/IMqttMessageListener.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/IMqttMessageListener.java
rename to mqtt/org/eclipse/paho/mqttv5/client/IMqttMessageListener.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/IMqttToken.java b/mqtt/org/eclipse/paho/mqttv5/client/IMqttToken.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/IMqttToken.java
rename to mqtt/org/eclipse/paho/mqttv5/client/IMqttToken.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttActionListener.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttActionListener.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttActionListener.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttActionListener.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttCallback.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttCallback.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttCallback.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttCallback.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttClient.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttClient.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttClient.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttClient.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttClientException.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttClientException.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttClientException.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttClientException.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttClientInterface.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttClientInterface.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttClientInterface.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttClientInterface.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttClientPersistence.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttClientPersistence.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttClientPersistence.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttClientPersistence.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttConnectionOptions.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptionsBuilder.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttConnectionOptionsBuilder.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttConnectionOptionsBuilder.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttConnectionOptionsBuilder.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttDeliveryToken.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttDeliveryToken.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttDeliveryToken.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttDeliveryToken.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttDisconnectResponse.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttDisconnectResponse.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttDisconnectResponse.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttDisconnectResponse.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttPingSender.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttPingSender.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttPingSender.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttPingSender.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttToken.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttToken.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttToken.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttToken.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/MqttTopic.java b/mqtt/org/eclipse/paho/mqttv5/client/MqttTopic.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/MqttTopic.java
rename to mqtt/org/eclipse/paho/mqttv5/client/MqttTopic.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/TimerPingSender.java b/mqtt/org/eclipse/paho/mqttv5/client/TimerPingSender.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/TimerPingSender.java
rename to mqtt/org/eclipse/paho/mqttv5/client/TimerPingSender.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/ClientState.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/ClientState.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsReceiver.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/CommsReceiver.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsReceiver.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/CommsReceiver.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsSender.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/CommsSender.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsSender.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/CommsSender.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsTokenStore.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/CommsTokenStore.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsTokenStore.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/CommsTokenStore.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/ConnectActionListener.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/ConnectActionListener.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/ConnectActionListener.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/ConnectActionListener.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/DestinationProvider.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/DestinationProvider.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/DestinationProvider.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/DestinationProvider.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/DisconnectedMessageBuffer.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/ExceptionHelper.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/ExceptionHelper.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/ExceptionHelper.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/ExceptionHelper.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/FileLock.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/FileLock.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/FileLock.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/FileLock.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/IDisconnectedBufferCallback.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/IDisconnectedBufferCallback.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/IDisconnectedBufferCallback.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/IDisconnectedBufferCallback.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/MessageCatalog.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/MessageCatalog.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/MessageCatalog.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/MessageCatalog.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttConnectionState.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/MqttConnectionState.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttConnectionState.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/MqttConnectionState.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttPersistentData.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/MqttPersistentData.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttPersistentData.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/MqttPersistentData.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttSessionState.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/MqttSessionState.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttSessionState.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/MqttSessionState.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttState.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/MqttState.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/MqttState.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/MqttState.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/NetworkModule.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/NetworkModule.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/NetworkModule.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/NetworkModule.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/NetworkModuleService.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/NetworkModuleService.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/NetworkModuleService.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/NetworkModuleService.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/ResourceBundleCatalog.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/ResourceBundleCatalog.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/ResourceBundleCatalog.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/ResourceBundleCatalog.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModule.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModule.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModule.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModule.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModuleFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModuleFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModuleFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/SSLNetworkModuleFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModuleFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModuleFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModuleFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModuleFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/internal/Token.java b/mqtt/org/eclipse/paho/mqttv5/client/internal/Token.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/internal/Token.java
rename to mqtt/org/eclipse/paho/mqttv5/client/internal/Token.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/logging/JSR47Logger.java b/mqtt/org/eclipse/paho/mqttv5/client/logging/JSR47Logger.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/logging/JSR47Logger.java
rename to mqtt/org/eclipse/paho/mqttv5/client/logging/JSR47Logger.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/logging/Logger.java b/mqtt/org/eclipse/paho/mqttv5/client/logging/Logger.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/logging/Logger.java
rename to mqtt/org/eclipse/paho/mqttv5/client/logging/Logger.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/logging/LoggerFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/logging/LoggerFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/logging/LoggerFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/logging/LoggerFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/logging/SimpleLogFormatter.java b/mqtt/org/eclipse/paho/mqttv5/client/logging/SimpleLogFormatter.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/logging/SimpleLogFormatter.java
rename to mqtt/org/eclipse/paho/mqttv5/client/logging/SimpleLogFormatter.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/logging/jsr47min.properties b/mqtt/org/eclipse/paho/mqttv5/client/logging/jsr47min.properties
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/logging/jsr47min.properties
rename to mqtt/org/eclipse/paho/mqttv5/client/logging/jsr47min.properties
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/logging/package.html b/mqtt/org/eclipse/paho/mqttv5/client/logging/package.html
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/logging/package.html
rename to mqtt/org/eclipse/paho/mqttv5/client/logging/package.html
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/persist/MemoryPersistence.java b/mqtt/org/eclipse/paho/mqttv5/client/persist/MemoryPersistence.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/persist/MemoryPersistence.java
rename to mqtt/org/eclipse/paho/mqttv5/client/persist/MemoryPersistence.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java b/mqtt/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java
rename to mqtt/org/eclipse/paho/mqttv5/client/persist/MqttDefaultFilePersistence.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/persist/PersistenceFileFilter.java b/mqtt/org/eclipse/paho/mqttv5/client/persist/PersistenceFileFilter.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/persist/PersistenceFileFilter.java
rename to mqtt/org/eclipse/paho/mqttv5/client/persist/PersistenceFileFilter.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/persist/PersistenceFileNameFilter.java b/mqtt/org/eclipse/paho/mqttv5/client/persist/PersistenceFileNameFilter.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/persist/PersistenceFileNameFilter.java
rename to mqtt/org/eclipse/paho/mqttv5/client/persist/PersistenceFileNameFilter.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/security/SSLSocketFactoryFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/security/SSLSocketFactoryFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/security/SSLSocketFactoryFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/security/SSLSocketFactoryFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/security/SimpleBase64Encoder.java b/mqtt/org/eclipse/paho/mqttv5/client/security/SimpleBase64Encoder.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/security/SimpleBase64Encoder.java
rename to mqtt/org/eclipse/paho/mqttv5/client/security/SimpleBase64Encoder.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/spi/NetworkModuleFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/spi/NetworkModuleFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/spi/NetworkModuleFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/spi/NetworkModuleFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/spi/package-info.java b/mqtt/org/eclipse/paho/mqttv5/client/spi/package-info.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/spi/package-info.java
rename to mqtt/org/eclipse/paho/mqttv5/client/spi/package-info.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/util/Debug.java b/mqtt/org/eclipse/paho/mqttv5/client/util/Debug.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/util/Debug.java
rename to mqtt/org/eclipse/paho/mqttv5/client/util/Debug.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/Base64.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/Base64.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/Base64.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/Base64.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/ExtendedByteArrayOutputStream.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/ExtendedByteArrayOutputStream.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/ExtendedByteArrayOutputStream.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/ExtendedByteArrayOutputStream.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/HandshakeFailedException.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/HandshakeFailedException.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/HandshakeFailedException.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/HandshakeFailedException.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketFrame.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketFrame.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketFrame.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketFrame.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketHandshake.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketHandshake.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketHandshake.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketHandshake.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModule.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModule.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModule.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModule.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModuleFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModuleFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModuleFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketNetworkModuleFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketReceiver.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketReceiver.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketReceiver.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketReceiver.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModule.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModule.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModule.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModule.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModuleFactory.java b/mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModuleFactory.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModuleFactory.java
rename to mqtt/org/eclipse/paho/mqttv5/client/websocket/WebSocketSecureNetworkModuleFactory.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/wire/MqttInputStream.java b/mqtt/org/eclipse/paho/mqttv5/client/wire/MqttInputStream.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/wire/MqttInputStream.java
rename to mqtt/org/eclipse/paho/mqttv5/client/wire/MqttInputStream.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/client/wire/MqttOutputStream.java b/mqtt/org/eclipse/paho/mqttv5/client/wire/MqttOutputStream.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/client/wire/MqttOutputStream.java
rename to mqtt/org/eclipse/paho/mqttv5/client/wire/MqttOutputStream.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java b/mqtt/org/eclipse/paho/mqttv5/common/ExceptionHelper.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/ExceptionHelper.java
rename to mqtt/org/eclipse/paho/mqttv5/common/ExceptionHelper.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/MqttException.java b/mqtt/org/eclipse/paho/mqttv5/common/MqttException.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/MqttException.java
rename to mqtt/org/eclipse/paho/mqttv5/common/MqttException.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/MqttMessage.java b/mqtt/org/eclipse/paho/mqttv5/common/MqttMessage.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/MqttMessage.java
rename to mqtt/org/eclipse/paho/mqttv5/common/MqttMessage.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/MqttPersistable.java b/mqtt/org/eclipse/paho/mqttv5/common/MqttPersistable.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/MqttPersistable.java
rename to mqtt/org/eclipse/paho/mqttv5/common/MqttPersistable.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/MqttPersistenceException.java b/mqtt/org/eclipse/paho/mqttv5/common/MqttPersistenceException.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/MqttPersistenceException.java
rename to mqtt/org/eclipse/paho/mqttv5/common/MqttPersistenceException.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/MqttSecurityException.java b/mqtt/org/eclipse/paho/mqttv5/common/MqttSecurityException.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/MqttSecurityException.java
rename to mqtt/org/eclipse/paho/mqttv5/common/MqttSecurityException.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/MqttSubscription.java b/mqtt/org/eclipse/paho/mqttv5/common/MqttSubscription.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/MqttSubscription.java
rename to mqtt/org/eclipse/paho/mqttv5/common/MqttSubscription.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/Validators.java b/mqtt/org/eclipse/paho/mqttv5/common/Validators.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/Validators.java
rename to mqtt/org/eclipse/paho/mqttv5/common/Validators.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttAck.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttAck.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttAck.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttAck.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttAuth.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttAuth.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttAuth.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttAuth.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttConnAck.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttConnAck.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttConnAck.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttConnAck.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttConnect.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttConnect.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttConnect.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttConnect.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDisconnect.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttDisconnect.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDisconnect.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttDisconnect.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPacketException.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPacketException.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPacketException.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPacketException.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPersistableWireMessage.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPersistableWireMessage.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPersistableWireMessage.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPersistableWireMessage.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPingReq.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPingReq.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPingReq.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPingReq.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPingResp.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPingResp.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPingResp.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPingResp.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttProperties.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubAck.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubAck.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubAck.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubAck.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubComp.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubComp.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubComp.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubComp.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubRec.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubRec.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubRec.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubRec.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubRel.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubRel.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPubRel.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPubRel.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPublish.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPublish.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttPublish.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttPublish.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttReceivedMessage.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttReceivedMessage.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttReceivedMessage.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttReceivedMessage.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttReturnCode.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttReturnCode.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttReturnCode.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttReturnCode.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttSubAck.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttSubAck.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttSubAck.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttSubAck.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttSubscribe.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttSubscribe.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttSubscribe.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttSubscribe.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttUnsubAck.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttUnsubAck.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttUnsubAck.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttUnsubAck.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttUnsubscribe.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttUnsubscribe.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttUnsubscribe.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttUnsubscribe.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttWireMessage.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/MqttWireMessage.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttWireMessage.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/MqttWireMessage.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/UserProperty.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/UserProperty.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/UserProperty.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/UserProperty.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/util/CountingInputStream.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/util/CountingInputStream.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/util/CountingInputStream.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/util/CountingInputStream.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/util/MultiByteArrayInputStream.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/util/MultiByteArrayInputStream.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/util/MultiByteArrayInputStream.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/util/MultiByteArrayInputStream.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/packet/util/VariableByteInteger.java b/mqtt/org/eclipse/paho/mqttv5/common/packet/util/VariableByteInteger.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/packet/util/VariableByteInteger.java
rename to mqtt/org/eclipse/paho/mqttv5/common/packet/util/VariableByteInteger.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/util/MqttTopicValidator.java b/mqtt/org/eclipse/paho/mqttv5/common/util/MqttTopicValidator.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/util/MqttTopicValidator.java
rename to mqtt/org/eclipse/paho/mqttv5/common/util/MqttTopicValidator.java
diff --git a/src/main/java/org/eclipse/paho/mqttv5/common/util/Strings.java b/mqtt/org/eclipse/paho/mqttv5/common/util/Strings.java
similarity index 100%
rename from src/main/java/org/eclipse/paho/mqttv5/common/util/Strings.java
rename to mqtt/org/eclipse/paho/mqttv5/common/util/Strings.java
diff --git a/src/com/feiwei/mqtt/SystemMqttService.java b/src/com/feiwei/mqtt/SystemMqttService.java
new file mode 100644
index 0000000..a4805f6
--- /dev/null
+++ b/src/com/feiwei/mqtt/SystemMqttService.java
@@ -0,0 +1,62 @@
+package com.feiwei.mqtt;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+import org.eclipse.paho.mqttv5.client.*;
+import org.eclipse.paho.mqttv5.client.persist.MemoryPersistence;
+
+public class SystemMqttService extends Service {
+ private static final String TAG = "SystemMqttService";
+ private IMqttAsyncClient client;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ Log.i(TAG, "MQTT System Service starting...");
+
+ try {
+ String clientId = "5xc_" + android.os.Build.SERIAL;
+ client = new MqttAsyncClient("tcp://your-server:1883", clientId, new MemoryPersistence());
+
+ MqttConnectionOptions options = new MqttConnectionOptions();
+ options.setAutomaticReconnect(true);
+ options.setCleanStart(true);
+
+ client.connect(options).waitForCompletion();
+
+ client.subscribe("/notify/" + clientId + "/command", 1, (topic, message) -> {
+ String payload = new String(message.getPayload());
+ Log.i(TAG, "Received command: " + payload);
+ // TODO: 这里调用 AdminService.setSimGpsData(...) 更新系统服务
+ });
+
+ } catch (Exception e) {
+ Log.e(TAG, "MQTT init error", e);
+ }
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ return START_STICKY;
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ try {
+ if (client != null && client.isConnected()) {
+ client.disconnect();
+ }
+ } catch (Exception e) {
+ Log.e(TAG, "MQTT disconnect error", e);
+ }
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return null;
+ }
+}
diff --git a/src/main/resources/META-INF/services/org.eclipse.paho.mqttv5.client.spi.NetworkModuleFactory b/src/main/resources/META-INF/services/org.eclipse.paho.mqttv5.client.spi.NetworkModuleFactory
deleted file mode 100644
index b955bc6..0000000
--- a/src/main/resources/META-INF/services/org.eclipse.paho.mqttv5.client.spi.NetworkModuleFactory
+++ /dev/null
@@ -1,5 +0,0 @@
-# build in NetworkModules
-org.eclipse.paho.mqttv5.client.internal.TCPNetworkModuleFactory
-org.eclipse.paho.mqttv5.client.internal.SSLNetworkModuleFactory
-org.eclipse.paho.mqttv5.client.websocket.WebSocketNetworkModuleFactory
-org.eclipse.paho.mqttv5.client.websocket.WebSocketSecureNetworkModuleFactory
diff --git a/src/main/resources/bundle.properties b/src/main/resources/bundle.properties
deleted file mode 100644
index bfb2a85..0000000
--- a/src/main/resources/bundle.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-############################################################################
-# Copyright (c) 2014 IBM Corp.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Eclipse Distribution License v1.0 which accompany this distribution.
-#
-# The Eclipse Public License is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# and the Eclipse Distribution License is available at
-# http://www.eclipse.org/org/documents/edl-v10.php.
-#
-############################################################################
-bundle.name=Paho MQTT Client
-bundle.provider=Eclipse.org - Paho
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/client/internal/nls/logcat.properties b/src/main/resources/org/eclipse/paho/mqttv5/client/internal/nls/logcat.properties
deleted file mode 100644
index 7e8e54f..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/client/internal/nls/logcat.properties
+++ /dev/null
@@ -1,189 +0,0 @@
-0=MQTT Catalog
-101= ClientID={0} ServerURI={1} PersistenceType={2}
-103=cleanStart={0} connectionTimeout={1} TimekeepAlive={2} userName={3} password={4} will={5} userContext={6} callback={7}
-104=> quiesceTimeout={0} userContext={1} callback={2}
-105=< exception
-106=Subscribe topicFilter={0} userContext={1} callback={2}
-107=Unsubscribe topic={0} userContext={1} callback={2}
-108=<
-109=<
-110=<
-111=< topic={0} message={1}userContext={1} callback={2}
-112=<
-113=<
-114=>
-115=URI={0}
-116=URI={0}
-117=>
-118=<200=internalSend key={0} message={1} token={2}
-119=Invalid URI Provided that could not be used to create a NetworkModule: {0}
-204=connect failed: rc={0}
-207=connect failed: not disconnected {0}
-208=failed: not connected
-209=connect failed: unexpected exception
-210=failed: called on callback thread
-211=failed: already disconnected
-212=connect failed: unexpected exception
-213=fail: token in use: key={0} message={1} token={2}
-214=state=CONNECTING
-215=state=CONNECTED
-216=state=DISCONNECTING
-217=state=DISCONNECTED
-218=state=DISCONNECTING
-219=failed: already disconnecting
-220=>
-221=>
-222=>
-223=failed: in closed state
-224=failed: not disconnected
-250=Failed to create TCP socket
-252=connect to host {0} port {1} timeout {2}
-260=setEnabledCiphers ciphers={0}
-300=key={0} message={1}
-302=existing key={0} message={1} token={2}
-303=creating new token key={0} message={1} token={2}
-305=> {0} tokens
-306=key={0}
-307=key={0} token={1}
-308=<>
-309=resp={0}
-310=>
-311=>
-312=>
-400=>key={0} timeout={1} sent={2} completed={3} hasException={4} response={5} token={6}
-401=failed with exception
-402=key={0} response={1}
-403=> key={0}
-404=>key={0} response={1} excep={2}
-406=key={0} timed out token={1}
-407=key={0} wait max={1} token={2}
-408=key={0} wait max={1}
-409=wait key={0}
-410=> key={0}
-411=>key={0} response={1} excep={2}
-500=Attempting to reconnect client: {0}
-501=Automatic Reconnect Successful: {0}
-502=Automatic Reconnect failed, rescheduling: {0}
-503=Start reconnect timer for client: {0}, delay: {1}
-504=Stop reconnect timer for client: {0}
-505=Rescheduling reconnect timer for client: {0}, delay: {1}
-506=Triggering Automatic Reconnect attempt.
-507=Client Connected, Offline Buffer available, but not empty. Adding message to buffer. message={0}
-508=Client Resting, Offline Buffer available. Adding message to buffer. message={0}
-509=Client Reconnected, Offline Buffer Available. Sending Buffered Messages.
-510=Publising Buffered message message={0}
-511=outbound QoS 0 publish key={0} message={1}
-512=QoS 0 publish key={0}
-513=Persisted Buffered Message key={0}
-514=Failed to persist buffered message key={0}
-515=Could not Persist, attempting to Re-Open Persistence Store
-516=Restoring all buffered messages.
-517=Un-Persisting Buffered message key={0}
-518=Failed to Un-Persist Buffered message key={0}
-519=Error occurred attempting to publish buffered message due to disconnect. Exception: {0}.
-529=Sent {0}
-530=Received {0}
-600=>
-601=key={0} message={1}
-602=key={0} exception
-603=clearState
-604=inbound QoS 2 publish key={0} message={1}
-605=outbound QoS 2 pubrel key={0} message={1}
-606=outbound QoS 2 completed key={0} message={1}
-607=outbound QoS 2 publish key={0} message={1}
-608=outbound QoS 1 publish key={0} message={1}
-609=removing orphaned pubrel key={0}
-610=QoS 2 publish key={0}
-611=QoS 2 pubrel key={0}
-612=QoS 1 publish key={0}
-613= sending {0} msgs at max inflight window
-615=pending send key={0} message {1}
-616=checkForActivity entered
-617=+1 inflightpubrels={0}
-618=key={0} QoS={1}
-619=Timed out as no activity, keepAlive={0} lastOutboundActivity={1} lastInboundActivity={2} time={3} lastPing={4}
-620=ping needed. keepAlive={0} lastOutboundActivity={1} lastInboundActivity={2}
-621=no outstanding flows and not connected
-622=inflight window full
-623=+1 actualInFlight={0}
-624=Schedule next ping at {0}
-625=key={0}
-626=quiescing={0} actualInFlight={1} pendingFlows={2} inFlightPubRels={3} callbackQuiesce={4} tokens={5}
-627=received key={0} message={1}
-628=pending publish key={0} qos={1} message={2}
-629=received key={0} token={1} message={2}
-630=received bytes count={0}
-631=connected
-632=reason {0}
-633=disconnected
-634=ping not needed yet. Schedule next ping
-635=ping sent. pingOutstanding: {0}
-636=ping response received. pingOutstanding: {0}
-637=timeout={0}
-638=notifying queueLock holders
-639=wait for outstanding: actualInFlight={0} pendingFlows={1} inFlightPubRels={2} tokens={3}
-640=finished
-641=remove publish from persistence. key={0}
-642=Timed out as no write activity, keepAlive={0} lastOutboundActivity={1} lastInboundActivity={2} time={3} lastPing={4}
-643=sent bytes count={0}
-644=wait for new work or for space in the inflight window
-645=removed QoS 2 publish/pubrel. key={0}, -1 inFlightPubRels={1}
-646=-1 actualInFlight={0}
-647=new work or ping arrived
-648=key{0}, msg={1}, excep={2}
-649=key={0},excep={1}
-650=removed Qos 1 publish. key={0}
-651=received key={0} message={1}
-652=Setting Incoming New Topic Alias alias={0}, topicName={1}
-653=Invalid Topic Alias: topicAliasMax={0}, publishTopicAlias={1}
-654=Unknown Topic Alias: Incoming Alias={1}
-659=start timer for client:{0}
-660=Check schedule at {0}
-661=stop
-662=no message found for ack id={0}
-663=Disconnect message received from Server. Details={0}
-664=[MQTT-4.3.3-4] - A Reason code greater than 0x80 (128) was received in an incoming PUBREC id={0} rc={1}, halting QoS 2 flow.
-665=Clearing Connection State (Topic Aliases)
-666=Orphaned Ack key={0} message={1}
-667=MqttPubRel was received with an error code: key={0} message={1}, Reason Code= {2}
-668=Creating MqttPubComp: {0}
-700=stopping
-701=notify workAvailable and wait for run
-703=stopped
-704=wait for workAvailable
-705=callback and notify for key={0}
-706=notify spaceAvailable
-708=call connectionLost
-709=wait for spaceAvailable
-710=new msg avail, notify workAvailable
-711=quiesce notify spaceAvailable
-713=call messageArrived key={0} topic={1}
-714=callback threw exception
-715=new workAvailable. key={0}
-716=call onSuccess key={0}
-717=call onFailure key {0}
-719=callback threw ex:
-720=Ignoring Exception thrown from connectionLost {0}
-725=Ignoring Exception thrown from messageArrived: {0}
-726=726=Ignoring Exception thrown from deliveryComplete {0}
-721=Non-Critical MQTT error thrown, passing back to application={0}
-722=Server initiated disconnect, connection closed. Disconnect={0}
-723=Creating MqttPubComp due to manual ACK: {0}
-724=Ignoring Exception thrown from mqttErrorOccurred: {0}
-725=Ignoring Exception thrown from messageArrived: {0}
-726=Ignoring Exception thrown from deliveryComplete {0}
-727=Ignoring Exception thrown from authPacketArrived {0}
-800=stopping sender
-801=stopped
-802=network send key={0} msg={1}
-803=get message returned null, stopping}
-804=exception
-805=<
-850=stopping
-851=stopped
-852=network read message
-853=Stopping due to IOException
-854=<
-855=starting
-856=Stopping, MQttException
-857=Unknown PubAck, PubComp or PubRec received. Ignoring.
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/logcat.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/logcat.properties
deleted file mode 100644
index 63f0a9f..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/logcat.properties
+++ /dev/null
@@ -1 +0,0 @@
-0=MQTT Catalog
\ No newline at end of file
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages.properties
deleted file mode 100644
index 5507838..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-#/*
-# * Copyright (c) 2017 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * James Sutton - Initial MQTTv5 implementation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Invalid protocol version
-2=Invalid client ID
-3=Broker unavailable
-4=Bad user name or password
-5=Not authorized to connect
-6=Unexpected error
-32000=Timed out waiting for a response from the server
-32001=Internal error, caused by no new message IDs being available
-32002=Timed out while waiting to write messages to the server
-32100=Client is connected
-32101=Client is disconnected
-32102=Client is currently disconnecting
-32103=Unable to connect to server
-32104=Client is not connected
-32105=The specified SocketFactory type does not match the broker URI
-32106=SSL configuration error
-32107=Disconnecting is not allowed from a callback method
-32108=Unrecognized packet
-32109=Connection lost
-32110=Connect already in progress
-32111=Client is closed
-32200=Persistence already in use
-32201=Token already in use
-32202=Too many publishes in progress
-32204=The Server Disconnected the client.
-32301=An invalid topic alias combination was received.
-50000=Invalid Message Property Identifier
-50001=Invalid Return code
-50002=Malformed Packet
-50003=Unsupported Protocol
-50004=An invalid topic alias combination was received in an incoming message.
-50005=Duplicate property in Packet
-51001=Incoming packet too large.
-51002=Outgoing packet too large.
-
-### - MQTTv5 Return Codes
-16=No matching subscribers.
-17=No subscription existed.
-24=Continue authentication.
-25=Re-authenticate.
-128=Unspecified error.
-129=Malformed packet.
-130=Protocol error.
-131=Implementation specific error.
-132=Unsupported protocol version.
-133=Client identifier not valid.
-134=Bad User Name or Password.
-135=Not authorized.
-136=Server unavailable.
-137=Server busy.
-138=Banned.
-139=Server shutting down.
-140=Bad authentication method.
-141=Keep Alive timeout.
-142=Session taken over.
-143=Topic Filter invalid.
-144=Topic Name invalid.
-145=Packet identifier in use.
-146=Packet identifier not found.
-147=Receive Maximum exceeded.
-148=Topic Alias invalid.
-149=Packet too large.
-150=Message rate too high.
-151=Quota exceeded.
-152=Administrative action.
-153=Payload format invalid.
-154=Retain not supported.
-155=QoS not supported
-156=Use another server.
-157=Server moved.
-158=Shared Subscriptions not supported.
-159=Connection rate exceeded.
-160=Maximum connect time.
-161=Subscription Identifiers not supported.
-162-Wildcard Subscriptions no supported.
\ No newline at end of file
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_cs.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_cs.properties
deleted file mode 100644
index c746dd1..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_cs.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Neplatn\u00e1 verze protokolu
-2=Neplatn\u00e9 ID klienta
-3=Nedostupn\u00fd zprost\u0159edkovatel
-4=Chybn\u00e9 jm\u00e9no u\u017eivatele nebo heslo
-5=Chyb\u00ed autorizace pro p\u0159ipojen\u00ed
-6=Neo\u010dek\u00e1van\u00e1 chyba
-32000=Vypr\u0161en\u00ed \u010dasov\u00e9ho limitu pro odpov\u011b\u010f ze serveru
-32100=Klient je p\u0159ipojen
-32101=Klient je odpojen
-32102=Klient se aktu\u00e1ln\u011b odpojuje
-32103=Nelze se p\u0159ipojit k serveru
-32104=Klient nen\u00ed p\u0159ipojen
-32105=Ur\u010den\u00fd typ polo\u017eky SocketFactory neodpov\u00edd\u00e1 identifik\u00e1toru URI zprost\u0159edkovatele.
-32106=Chyba konfigurace zabezpe\u010den\u00ed SSL
-32107=Z metody zp\u011btn\u00e9ho vol\u00e1n\u00ed nen\u00ed povoleno odpojen\u00ed
-32108=Nerozpoznan\u00fd paket
-32109=P\u0159ipojen\u00ed bylo ztraceno.
-32110=P\u0159ipojen\u00ed ji\u017e prob\u00edh\u00e1
-32111=Klient je zav\u0159en
-32200=Perzistence je ji\u017e pou\u017e\u00edv\u00e1na.
-32201=Token se ji\u017e pou\u017e\u00edv\u00e1
-32202=Prob\u00edh\u00e1 p\u0159\u00edli\u0161 mnoho publikov\u00e1n\u00ed
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_de.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_de.properties
deleted file mode 100644
index bdd4d48..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_de.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Protokollversion ung\u00fcltig
-2=Client-ID ung\u00fcltig
-3=Broker nicht verf\u00fcgbar
-4=Benutzername oder Kennwort falsch
-5=Keine Berechtigung f\u00fcr Verbindung
-6=Unerwarteter Fehler
-32000=Zeitlimit\u00fcberschreitung beim Warten auf eine Antwort vom Server
-32100=Verbindung zu Client ist hergestellt
-32101=Verbindung zu Client ist getrennt
-32102=Verbindung zu Client wird derzeit getrennt
-32103=Verbindung zu Server kann nicht hergestellt werden
-32104=Keine Verbindung zu Client
-32105=Der angegebene Socket-Factorytyp entspricht nicht der Broker-URI
-32106=SSL-Konfigurationsfehler
-32107=Trennung einer Verbindung \u00fcber eine Callback-Methode ist nicht zul\u00e4ssig
-32108=Paket nicht erkannt
-32109=Verbindung wurde getrennt
-32110=Verbindungsherstellung wird ausgef\u00fchrt
-32111=Client ist geschlossen
-32200=Persistenz wird bereits verwendet
-32201=Token wird bereits verwendet
-32202=Zu viele Ver\u00f6ffentlichungen werden ausgef\u00fchrt
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_es.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_es.properties
deleted file mode 100644
index 7517e09..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_es.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Versi\u00f3n de protocolo incorrecta
-2=Identificador de cliente incorrecto
-3=Intermediario no disponible
-4=Nombre de usuario o contrase\u00f1a incorrecto
-5=No autorizado a conectarse
-6=Error inesperado
-32000=Tiempo de espera excedido al esperar una respuesta del servidor
-32100=El cliente est\u00e1 conectado
-32101=El cliente est\u00e1 desconectado
-32102=El cliente se est\u00e1 desconectando
-32103=No es posible conectarse al servidor
-32104=El cliente no est\u00e1 conectado
-32105=El tipo SocketFactory especificado no coincide con el URI del intermediario
-32106=Error de configuraci\u00f3n SSL
-32107=No se permite la desconexi\u00f3n desde un m\u00e9todo de devoluci\u00f3n de llamada
-32108=Paquete no reconocido
-32109=Se ha perdido la conexi\u00f3n
-32110=Conexi\u00f3n ya en curso
-32111=El cliente est\u00e1 cerrado
-32200=La persistencia ya se est\u00e1 utilizando
-32201=La se\u00f1al ya se est\u00e1 utilizando
-32202=Demasiadas publicaciones en curso
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_fr.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_fr.properties
deleted file mode 100644
index d7b42e4..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_fr.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Version de protocole incorrecte
-2=ID client incorrect
-3=Courtier indisponible
-4=Nom d'utilisateur ou mot de passe incorrect
-5=L'utilisateur n'est pas autoris\u00e9 \u00e0 se connecter
-6=Erreur inattendue.
-32000=Expiration du d\u00e9lai d'attente d'une r\u00e9ponse du serveur
-32100=Client connect\u00e9
-32101=Client d\u00e9connect\u00e9
-32102=Client en cours de d\u00e9connexion
-32103=Impossible de se connecter au serveur
-32104=Client non connect\u00e9
-32105=Le type SocketFactory sp\u00e9cifi\u00e9 ne correspond pas \u00e0 l'URI de courtier
-32106=Erreur de configuration SSL
-32107=D\u00e9connexion non autoris\u00e9e pour une m\u00e9thode de rappel
-32108=Paquet non reconnu
-32109=Connexion perdue
-32110=Connexion d\u00e9j\u00e0 en cours
-32111=Client ferm\u00e9
-32200=La persistance est d\u00e9j\u00e0 en cours d'utilisation
-32201=Jeton d\u00e9j\u00e0 en cours d'utilisation
-32202=Trop de publications en cours
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_hu.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_hu.properties
deleted file mode 100644
index dc4cfe6..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_hu.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=\u00c9rv\u00e9nytelen protokoll v\u00e1ltozat
-2=\u00c9rv\u00e9nytelen \u00fcgyf\u00e9lazonos\u00edt\u00f3
-3=K\u00f6zvet\u00edt\u0151 nem el\u00e9rhet\u0151
-4=Rossz felhaszn\u00e1l\u00f3i n\u00e9v vagy jelsz\u00f3
-5=Nem jogosult csatlakozni
-6=V\u00e1ratlan hiba
-32000=T\u00fall\u00e9pte a megengedett id\u0151t a kiszolg\u00e1l\u00f3 v\u00e1lasz\u00e1ra v\u00e1rva
-32100=Az \u00fcgyf\u00e9l csatlakoztatva van
-32101=Az \u00fcgyf\u00e9l sz\u00e9tkapcsolt
-32102=Az \u00fcgyf\u00e9l \u00e9pp megszak\u00edtja a kapcsolatot
-32103=Nem lehet kapcsol\u00f3dni a kiszolg\u00e1l\u00f3hoz
-32104=Az \u00fcgyf\u00e9l nincs csatlakoztatva
-32105=A megadott SocketFactory t\u00edpus nem illeszkedik a k\u00f6zvet\u00edt\u0151 URI azonos\u00edt\u00f3hoz
-32106=SSL konfigur\u00e1ci\u00f3s hiba
-32107=A megszak\u00edt\u00e1s visszah\u00edv\u00e1s met\u00f3dusb\u00f3l nem enged\u00e9lyezett
-32108=Ismeretlen csomag
-32109=Kapcsolat elveszett
-32110=A csatlakoz\u00e1s m\u00e1r folyamatban van
-32111=Az \u00fcgyf\u00e9l bez\u00e1r\u00e1sra ker\u00fclt
-32200=A megmarad\u00f3 \u00e1llapot m\u00e1r haszn\u00e1latban van
-32201=A token m\u00e1r haszn\u00e1latban van.
-32202=T\u00fal sok k\u00f6zz\u00e9t\u00e9tel van folyamatban
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_it.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_it.properties
deleted file mode 100644
index e0dcfcc..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_it.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Versione di protocollo non valida
-2=ID client non valido
-3=Broker non disponibile
-4=Nome utente o password non validi
-5=Non autorizzato per la connessione
-6=Errore imprevisto
-32000=Scaduto in attesa di una risposta dal server
-32100=Client connesso
-32101=Client disconnesso
-32102=Client in fase di disconnessione
-32103=Impossibile effettuare la connessione al server
-32104=Client non connesso
-32105=Il tipo SocketFactory specificato non corrisponde all'URI del broker
-32106=Errore di configurazione SSL
-32107=Disconnessione non consentita da un metodo callback
-32108=Pacchetto non riconosciuto
-32109=Connessione persa
-32110=Connessione gi\u00e0 in corso
-32111=Client chiuso
-32200=Persistenza gi\u00e0 in uso
-32201=Token gi\u00e0 in uso
-32202=Numero eccessivo di pubblicazioni in corso
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ja.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ja.properties
deleted file mode 100644
index 9f78d2a..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ja.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=\u7121\u52b9\u306a\u30d7\u30ed\u30c8\u30b3\u30eb\u30fb\u30d0\u30fc\u30b8\u30e7\u30f3\u3067\u3059
-2=\u7121\u52b9\u306a\u30af\u30e9\u30a4\u30a2\u30f3\u30c8 ID \u3067\u3059
-3=\u30d6\u30ed\u30fc\u30ab\u30fc\u304c\u4f7f\u7528\u4e0d\u53ef\u3067\u3059
-4=\u9593\u9055\u3063\u305f\u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059
-5=\u63a5\u7d9a\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093
-6=\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc
-32000=\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u5f85\u6a5f\u304c\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306b\u306a\u308a\u307e\u3057\u305f
-32100=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306b\u63a5\u7d9a\u3057\u307e\u3057\u305f
-32101=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u3092\u5207\u65ad\u3057\u307e\u3057\u305f
-32102=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306f\u73fe\u5728\u5207\u65ad\u4e2d\u3067\u3059
-32103=\u30b5\u30fc\u30d0\u30fc\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093
-32104=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u306f\u63a5\u7d9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-32105=\u6307\u5b9a\u3055\u308c\u305f SocketFactory \u30bf\u30a4\u30d7\u306f\u30d6\u30ed\u30fc\u30ab\u30fc URI \u3068\u4e00\u81f4\u3057\u307e\u305b\u3093
-32106=SSL \u69cb\u6210\u30a8\u30e9\u30fc\u3067\u3059
-32107=\u30b3\u30fc\u30eb\u30d0\u30c3\u30af\u30fb\u30e1\u30bd\u30c3\u30c9\u304b\u3089\u306e\u5207\u65ad\u306f\u8a31\u53ef\u3055\u308c\u307e\u305b\u3093
-32108=\u8b58\u5225\u3055\u308c\u3066\u3044\u306a\u3044\u30d1\u30b1\u30c3\u30c8\u3067\u3059
-32109=\u63a5\u7d9a\u55aa\u5931
-32110=\u63a5\u7d9a\u51e6\u7406\u306f\u65e2\u306b\u9032\u884c\u4e2d\u3067\u3059
-32111=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u304c\u30af\u30ed\u30fc\u30ba\u3055\u308c\u307e\u3057\u305f
-32200=\u30d1\u30fc\u30b7\u30b9\u30bf\u30f3\u30b9\u306f\u3059\u3067\u306b\u4f7f\u7528\u4e2d\u3067\u3059\u3002
-32201=\u30c8\u30fc\u30af\u30f3\u306f\u65e2\u306b\u4f7f\u7528\u4e2d\u3067\u3059
-32202=\u51e6\u7406\u4e2d\u306e\u30d1\u30d6\u30ea\u30c3\u30b7\u30e5\u304c\u591a\u3059\u304e\u307e\u3059
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ko.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ko.properties
deleted file mode 100644
index 2209928..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ko.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=\uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 \ud504\ub85c\ud1a0\ucf5c \ubc84\uc804
-2=\uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 \ud074\ub77c\uc774\uc5b8\ud2b8 ID
-3=\ube0c\ub85c\ucee4 \uc0ac\uc6a9 \ubd88\uac00\ub2a5
-4=\uc798\ubabb\ub41c \uc0ac\uc6a9\uc790 \uc774\ub984 \ub610\ub294 \ube44\ubc00\ubc88\ud638
-5=\uc5f0\uacb0\ud560 \uc218 \uc788\ub294 \uad8c\ud55c\uc774 \ubd80\uc5ec\ub418\uc9c0 \uc54a\uc74c
-6=\uc608\uc0c1\uce58 \ubabb\ud55c \uc624\ub958
-32000=\uc11c\ubc84\uc5d0\uc11c \uc751\ub2f5\uc744 \uae30\ub2e4\ub9ac\ub294 \uc911 \uc81c\ud55c\uc2dc\uac04 \ucd08\uacfc
-32100=\ud074\ub77c\uc774\uc5b8\ud2b8\uac00 \uc5f0\uacb0\ub428
-32101=\ud074\ub77c\uc774\uc5b8\ud2b8\uac00 \uc5f0\uacb0\uc774 \ub04a\uae40
-32102=\ud604\uc7ac \ud074\ub77c\uc774\uc5b8\ud2b8\uac00 \uc5f0\uacb0\uc744 \ub04a\ub294 \uc911
-32103=\uc11c\ubc84\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc74c
-32104=\ud074\ub77c\uc774\uc5b8\ud2b8\uac00 \uc5f0\uacb0\ub418\uc9c0 \uc54a\uc74c
-32105=\uc9c0\uc815\ub41c SocketFactory \uc720\ud615\uc774 \ube0c\ub85c\ucee4 URI\uc640 \uc77c\uce58\ud558\uc9c0 \uc54a\uc74c
-32106=SSL \uad6c\uc131 \uc624\ub958
-32107=\ucf5c\ubc31 \uba54\uc18c\ub4dc\ub85c\ubd80\ud130 \uc5f0\uacb0\uc744 \ub04a\ub294 \uac83\uc774 \ud5c8\uc6a9\ub418\uc9c0 \uc54a\uc74c
-32108=\uc778\uc2dd\ub418\uc9c0 \uc54a\uc740 \ud328\ud0b7
-32109=\uc5f0\uacb0 \uc720\uc2e4
-32110=\uc5f0\uacb0\uc774 \uc774\ubbf8 \uc9c4\ud589 \uc911\uc784
-32111=\ud074\ub77c\uc774\uc5b8\ud2b8\uac00 \ub2eb\ud798
-32200=\uc9c0\uc18d \ud30c\uc77c\uc744 \uc774\ubbf8 \uc0ac\uc6a9 \uc911
-32201=\ud1a0\ud070\uc774 \uc774\ubbf8 \uc0ac\uc6a9 \uc911\uc784
-32202=\ub108\ubb34 \ub9ce\uc740 \ubc1c\ud589\uc774 \uc9c4\ud589 \uc911\uc784
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_pl.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_pl.properties
deleted file mode 100644
index 255175c..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_pl.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Niepoprawna wersja protoko\u0142u
-2=Niepoprawny identyfikator klienta
-3=Broker niedost\u0119pny
-4=Niepoprawna nazwa u\u017cytkownika lub has\u0142o
-5=Brak autoryzacji do nawi\u0105zania po\u0142\u0105czenia
-6=Nieoczekiwany b\u0142\u0105d
-32000=Przekroczono limit czasu oczekiwania na odpowied\u017a z serwera
-32100=Po\u0142\u0105czenie z klientem zosta\u0142o nawi\u0105zane
-32101=Po\u0142\u0105czenie z klientem zosta\u0142o roz\u0142\u0105czone
-32102=Klient roz\u0142\u0105cza si\u0119
-32103=Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia z serwerem
-32104=Po\u0142\u0105czenie z klientem nie jest nawi\u0105zane
-32105=Podany typ fabryki SocketFactory nie jest zgodny z identyfikatorem URI brokera
-32106=B\u0142\u0105d konfiguracji protoko\u0142u SSL
-32107=Roz\u0142\u0105czenie nie jest dozwolone w metodzie procedury zwrotnej
-32108=Nierozpoznany pakiet
-32109=Utracono po\u0142\u0105czenie
-32110=Operacja nawi\u0105zywania po\u0142\u0105czenia jest ju\u017c w toku
-32111=Klient zosta\u0142 zamkni\u0119ty
-32200=Trwa\u0142o\u015b\u0107 jest ju\u017c w u\u017cyciu
-32201=Znacznik jest ju\u017c w u\u017cyciu
-32202=Zbyt wiele operacji publikowania jest w toku
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_pt_BR.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_pt_BR.properties
deleted file mode 100644
index f9345ad..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_pt_BR.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=Vers\u00e3o de protocolo inv\u00e1lida
-2=ID de cliente inv\u00e1lido
-3=Broker indispon\u00edvel
-4=Nome de usu\u00e1rio ou senha inv\u00e1lidos
-5=N\u00e3o autorizado a conectar
-6=Erro inesperado
-32000=Tempo limite atingido ao aguardar por uma resposta do servidor
-32100=O cliente est\u00e1 conectado
-32101=O cliente est\u00e1 desconectado
-32102=Cliente desconectando atualmente
-32103=N\u00e3o \u00e9 poss\u00edvel se conectar ao servidor
-32104=O cliente n\u00e3o est\u00e1 conectado
-32105=O tipo SocketFactory especificado n\u00e3o corresponde ao URI do broker
-32106=Erro de configura\u00e7\u00e3o de SSL
-32107=A desconex\u00e3o n\u00e3o \u00e9 permitida a partir de um m\u00e9todo de retorno de chamada
-32108=Pacote n\u00e3o reconhecido
-32109=Conex\u00e3o perdida
-32110=A conex\u00e3o j\u00e1 est\u00e1 em andamento
-32111=O cliente foi encerrado
-32200=Persist\u00eancia j\u00e1 em uso
-32201=O token j\u00e1 est\u00e1 em uso
-32202=Muitas publica\u00e7\u00f5es em andamento
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ru.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ru.properties
deleted file mode 100644
index 39fe6b6..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_ru.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430
-2=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b\u0439 \u0418\u0414 \u043a\u043b\u0438\u0435\u043d\u0442\u0430
-3=\u041f\u043e\u0441\u0440\u0435\u0434\u043d\u0438\u043a \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d
-4=\u041e\u0448\u0438\u0431\u043e\u0447\u043d\u043e\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c
-5=\u041d\u0435\u0442 \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043d\u0430 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435
-6=\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430
-32000=\u0422\u0430\u043c-\u0430\u0443\u0442 \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f \u043e\u0442\u0432\u0435\u0442\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430
-32100=\u041a\u043b\u0438\u0435\u043d\u0442 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d
-32101=\u041a\u043b\u0438\u0435\u043d\u0442 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d
-32102=\u041a\u043b\u0438\u0435\u043d\u0442 \u043e\u0442\u043a\u043b\u044e\u0447\u0430\u0435\u0442\u0441\u044f
-32103=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443
-32104=\u041a\u043b\u0438\u0435\u043d\u0442 \u043d\u0435 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d
-32105=\u0422\u0438\u043f SocketFactory \u043d\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 URI \u043f\u043e\u0441\u0440\u0435\u0434\u043d\u0438\u043a\u0430
-32106=\u041e\u0448\u0438\u0431\u043a\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 SSL
-32107=\u041e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u043e \u0432 \u043c\u0435\u0442\u043e\u0434\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u043e\u0433\u043e \u0432\u044b\u0437\u043e\u0432\u0430
-32108=\u041d\u0435\u0440\u0430\u0441\u043f\u043e\u0437\u043d\u0430\u043d\u043d\u044b\u0439 \u043f\u0430\u043a\u0435\u0442
-32109=\u0421\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u043e
-32110=\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435
-32111=\u041a\u043b\u0438\u0435\u043d\u0442 \u0437\u0430\u043a\u0440\u044b\u0442
-32200=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f
-32201=\u041c\u0430\u0440\u043a\u0435\u0440 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f
-32202=\u0412\u044b\u043f\u043e\u043b\u043d\u044f\u0435\u0442\u0441\u044f \u0441\u043b\u0438\u0448\u043a\u043e\u043c \u043c\u043d\u043e\u0433\u043e \u043f\u0443\u0431\u043b\u0438\u043a\u0430\u0446\u0438\u0439
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_zh_CN.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_zh_CN.properties
deleted file mode 100644
index 8483ef8..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_zh_CN.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=\u65e0\u6548\u534f\u8bae\u7248\u672c
-2=\u65e0\u6548\u5ba2\u6237\u673a\u6807\u8bc6
-3=\u4ee3\u7406\u7a0b\u5e8f\u4e0d\u53ef\u7528
-4=\u9519\u8bef\u7684\u7528\u6237\u540d\u6216\u5bc6\u7801
-5=\u65e0\u6743\u8fde\u63a5
-6=\u610f\u5916\u9519\u8bef
-32000=\u7b49\u5f85\u6765\u81ea\u670d\u52a1\u5668\u7684\u54cd\u5e94\u65f6\u8d85\u65f6
-32100=\u5df2\u8fde\u63a5\u5ba2\u6237\u673a
-32101=\u5df2\u65ad\u5f00\u5ba2\u6237\u673a\u8fde\u63a5
-32102=\u5ba2\u6237\u673a\u6b63\u5728\u65ad\u5f00\u8fde\u63a5
-32103=\u65e0\u6cd5\u8fde\u63a5\u81f3\u670d\u52a1\u5668
-32104=\u5ba2\u6237\u673a\u672a\u8fde\u63a5
-32105=\u6307\u5b9a\u7684 SocketFactory \u7c7b\u578b\u4e0e\u4ee3\u7406\u7a0b\u5e8f URI \u4e0d\u5339\u914d
-32106=SSL \u914d\u7f6e\u9519\u8bef
-32107=\u4e0d\u5141\u8bb8\u901a\u8fc7\u56de\u8c03\u65b9\u6cd5\u65ad\u5f00\u8fde\u63a5
-32108=\u4e0d\u53ef\u8bc6\u522b\u7684\u5305
-32109=\u5df2\u65ad\u5f00\u8fde\u63a5
-32110=\u5df2\u5728\u8fdb\u884c\u8fde\u63a5
-32111=\u5ba2\u6237\u673a\u5df2\u5173\u95ed
-32200=\u6301\u4e45\u6027\u5df2\u5728\u4f7f\u7528\u4e2d
-32201=\u4ee4\u724c\u5df2\u5728\u4f7f\u7528\u4e2d
-32202=\u6b63\u5728\u8fdb\u884c\u8fc7\u591a\u7684\u53d1\u5e03
diff --git a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_zh_TW.properties b/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_zh_TW.properties
deleted file mode 100644
index 846f1b6..0000000
--- a/src/main/resources/org/eclipse/paho/mqttv5/common/nls/messages_zh_TW.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-#/*
-# * Copyright (c) 2009, 2012 IBM Corp.
-# *
-# * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
-# * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
-# *
-# * Contributors:
-# * Dave Locke - initial API and implementation and/or initial documentation
-# */
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UNICODE
-1=\u901a\u8a0a\u5354\u5b9a\u7248\u672c\u7121\u6548
-2=\u7528\u6236\u7aef ID \u7121\u6548
-3=\u5206\u914d\u7ba1\u7406\u7cfb\u7d71\u7121\u6cd5\u4f7f\u7528
-4=\u4f7f\u7528\u8005\u540d\u7a31\u6216\u5bc6\u78bc\u4e0d\u7576
-5=\u672a\u7372\u6388\u6b0a\u9023\u63a5
-6=\u975e\u9810\u671f\u7684\u932f\u8aa4
-32000=\u7b49\u5f85\u4f3a\u670d\u5668\u7684\u56de\u61c9\u6642\u903e\u6642
-32100=\u5df2\u9023\u63a5\u7528\u6236\u7aef
-32101=\u5df2\u4e2d\u65b7\u7528\u6236\u7aef\u7684\u9023\u63a5
-32102=\u7528\u6236\u7aef\u76ee\u524d\u6b63\u5728\u4e2d\u65b7\u9023\u7dda
-32103=\u7121\u6cd5\u9023\u63a5\u5230\u4f3a\u670d\u5668
-32104=\u7528\u6236\u7aef\u672a\u9023\u63a5
-32105=\u6307\u5b9a\u7684 SocketFactory \u985e\u578b\u8207\u5206\u914d\u7ba1\u7406\u7cfb\u7d71 URI \u4e0d\u7b26
-32106=SSL \u914d\u7f6e\u932f\u8aa4
-32107=\u4e0d\u5bb9\u8a31\u8207\u56de\u547c\u65b9\u6cd5\u4e2d\u65b7\u9023\u7dda
-32108=\u5c01\u5305\u7121\u6cd5\u8fa8\u8b58
-32109=\u9023\u7dda\u907a\u5931
-32110=\u9023\u63a5\u5df2\u5728\u9032\u884c\u4e2d
-32111=\u5df2\u95dc\u9589\u7528\u6236\u7aef
-32200=\u6301\u7e8c\u6027\u5df2\u5728\u4f7f\u7528\u4e2d
-32201=\u8a18\u865f\u5df2\u5728\u4f7f\u7528\u4e2d
-32202=\u592a\u591a\u767c\u4f48\u9032\u884c\u4e2d