You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/02/22 15:02:38 UTC
[1/3] incubator-edgent git commit: [Edgent-380] update MQTT connector
to use paho-mqtt 1.1.0
Repository: incubator-edgent
Updated Branches:
refs/heads/master 6744cbe12 -> 2d94ce06b
[Edgent-380] update MQTT connector to use paho-mqtt 1.1.0
- remove the sample run script workaround that was added earlier
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/d71b0b5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/d71b0b5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/d71b0b5f
Branch: refs/heads/master
Commit: d71b0b5f9e5db31458474405264376c23afa9791
Parents: b1b4337
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Feb 21 12:32:33 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Feb 21 12:32:33 2017 -0500
----------------------------------------------------------------------
scripts/connectors/iotp/runiotpsensors.sh | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/d71b0b5f/scripts/connectors/iotp/runiotpsensors.sh
----------------------------------------------------------------------
diff --git a/scripts/connectors/iotp/runiotpsensors.sh b/scripts/connectors/iotp/runiotpsensors.sh
index cc592d5..b98f51b 100755
--- a/scripts/connectors/iotp/runiotpsensors.sh
+++ b/scripts/connectors/iotp/runiotpsensors.sh
@@ -30,14 +30,7 @@ edgent=../../..
# IBM Watson IoT Platform and a sample is in this directory
# (omitting values for the authorization tokens).
-# Avoid a paho mqtt class security exception.
-# The connector samples jar has dependencies on both the iotp and mqtt connectors
-# and those have dependencies on different versions of the paho mqtt jar.
-# Ensure the right one is used for this sample.
-#
#export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
-IOTP_MQTT_JAR=`ls ${edgent}/connectors/iotp/ext/org.eclipse.paho.client.mqtt*.jar`
-export CLASSPATH=${IOTP_MQTT_JAR}:${edgent}/samples/lib/edgent.samples.connectors.jar
# https://github.com/ibm-watson-iot/iot-java/tree/master#migration-from-release-015-to-021
# Uncomment the following to use the pre-0.2.1 WIoTP client behavior.
[3/3] incubator-edgent git commit: Merge pull request #288
Posted by dl...@apache.org.
Merge pull request #288
This closes #288
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/2d94ce06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/2d94ce06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/2d94ce06
Branch: refs/heads/master
Commit: 2d94ce06bda1559f1b7dc69f45031735b22e996c
Parents: 6744cbe 2f001aa
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Feb 22 10:02:33 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Feb 22 10:02:33 2017 -0500
----------------------------------------------------------------------
scripts/connectors/iotp/runiotpsensors.sh | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-edgent git commit: uncomment the export
Posted by dl...@apache.org.
uncomment the export
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/2f001aa8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/2f001aa8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/2f001aa8
Branch: refs/heads/master
Commit: 2f001aa8975dc0a903addf7911bbe7e549afe9e0
Parents: d71b0b5
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Tue Feb 21 12:33:55 2017 -0500
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Tue Feb 21 12:33:55 2017 -0500
----------------------------------------------------------------------
scripts/connectors/iotp/runiotpsensors.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/2f001aa8/scripts/connectors/iotp/runiotpsensors.sh
----------------------------------------------------------------------
diff --git a/scripts/connectors/iotp/runiotpsensors.sh b/scripts/connectors/iotp/runiotpsensors.sh
index b98f51b..d712495 100755
--- a/scripts/connectors/iotp/runiotpsensors.sh
+++ b/scripts/connectors/iotp/runiotpsensors.sh
@@ -30,7 +30,7 @@ edgent=../../..
# IBM Watson IoT Platform and a sample is in this directory
# (omitting values for the authorization tokens).
-#export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
+export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
# https://github.com/ibm-watson-iot/iot-java/tree/master#migration-from-release-015-to-021
# Uncomment the following to use the pre-0.2.1 WIoTP client behavior.