Merge "Bug 445785: Rename library to Paho"
diff --git a/.buildpath b/.buildpath
index 986b443..7618d75 100644
--- a/.buildpath
+++ b/.buildpath
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<buildpath>
- <buildpathentry kind="src" path="lua"/>
+ <buildpathentry kind="src" path="paho"/>
<buildpathentry kind="con" path="org.eclipse.koneki.ldt.ExecutionEnvironmentContainer/lua/5.1"/>
</buildpath>
diff --git a/lua/example/example_00.lua b/paho/example/example_00.lua
similarity index 98%
rename from lua/example/example_00.lua
rename to paho/example/example_00.lua
index 1c7445b..a17acde 100755
--- a/lua/example/example_00.lua
+++ b/paho/example/example_00.lua
@@ -59,7 +59,7 @@
-t,--topic_p (default test/2) Publish topic
]]
-local MQTT = require("mqtt_library")
+local MQTT = require "paho.mqtt"
local mqtt_client = MQTT.client.create(args.host, args.port, callback)
diff --git a/lua/example/example_01.lua b/paho/example/example_01.lua
similarity index 98%
rename from lua/example/example_01.lua
rename to paho/example/example_01.lua
index d949f34..c4262ef 100755
--- a/lua/example/example_01.lua
+++ b/paho/example/example_01.lua
@@ -55,7 +55,7 @@
-t,--topic_p (default test/2) Publish topic
]]
-local MQTT = require("mqtt_library")
+local MQTT = require "paho.mqtt"
local mqtt_client1 = MQTT.client.create(args.host_s, args.port_s, callback)
local mqtt_client2 = MQTT.client.create(args.host_p, args.port_p)
diff --git a/lua/example/example_02.lua b/paho/example/example_02.lua
similarity index 97%
rename from lua/example/example_02.lua
rename to paho/example/example_02.lua
index 575c411..56e3de2 100755
--- a/lua/example/example_02.lua
+++ b/paho/example/example_02.lua
@@ -42,7 +42,7 @@
-t,--topic (default test/2) Topic on which to publish
]]
-local MQTT = require("mqtt_library")
+local MQTT = require "paho.mqtt"
local mqtt_client = MQTT.client.create(args.host, args.port)
diff --git a/lua/example/mqtt_publish.lua b/paho/example/mqtt_publish.lua
similarity index 98%
rename from lua/example/mqtt_publish.lua
rename to paho/example/mqtt_publish.lua
index d39a1a7..e513e11 100755
--- a/lua/example/mqtt_publish.lua
+++ b/paho/example/mqtt_publish.lua
@@ -53,7 +53,7 @@
-w,--will_topic (default .) Last will and testament topic
]]
-local MQTT = require("mqtt_library")
+local MQTT = require "paho.mqtt"
if (args.debug) then MQTT.Utility.set_debug(true) end
diff --git a/lua/example/mqtt_subscribe.lua b/paho/example/mqtt_subscribe.lua
similarity index 98%
rename from lua/example/mqtt_subscribe.lua
rename to paho/example/mqtt_subscribe.lua
index e1c87ae..b203737 100755
--- a/lua/example/mqtt_subscribe.lua
+++ b/paho/example/mqtt_subscribe.lua
@@ -62,7 +62,7 @@
-w,--will_topic (default .) Last will and testament topic
]]
-local MQTT = require("mqtt_library")
+local MQTT = require "paho.mqtt"
if (args.debug) then MQTT.Utility.set_debug(true) end
diff --git a/lua/example/mqtt_test.lua b/paho/example/mqtt_test.lua
similarity index 98%
rename from lua/example/mqtt_test.lua
rename to paho/example/mqtt_test.lua
index 33a6a82..aa79acd 100755
--- a/lua/example/mqtt_test.lua
+++ b/paho/example/mqtt_test.lua
@@ -61,7 +61,7 @@
<host> (default localhost) MQTT server hostname
]]
-local MQTT = require("mqtt_library")
+local MQTT = require "paho.mqtt"
if (args.debug) then MQTT.Utility.set_debug(true) end
diff --git a/lua/mqtt_library.lua b/paho/mqtt.lua
similarity index 98%
rename from lua/mqtt_library.lua
rename to paho/mqtt.lua
index ced5cb4..3c20c63 100644
--- a/lua/mqtt_library.lua
+++ b/paho/mqtt.lua
@@ -84,7 +84,7 @@
---
-- @field [parent = #mqtt_library] utility#utility Utility
--
-MQTT.Utility = require("utility")
+MQTT.Utility = require "paho.utility"
---
-- @field [parent = #mqtt_library] #number VERSION
@@ -860,6 +860,6 @@
self.outstanding[self.message_id] = { "unsubscribe", topics }
end
--- For ... MQTT = require("mqtt_library")
+-- For ... MQTT = require 'paho.mqtt'
return(MQTT)
diff --git a/lua/utility.lua b/paho/utility.lua
similarity index 98%
rename from lua/utility.lua
rename to paho/utility.lua
index b2f11af..e4fbfa9 100644
--- a/lua/utility.lua
+++ b/paho/utility.lua
@@ -234,7 +234,7 @@
--
Utility.table_to_string = table_to_string
--- For ... Utility = require("utility")
+-- For ... Utility = require 'paho.utility'
return(Utility)
