December 9, 2013
-The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise -indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL"). -A copy of the EPL is available at -http://www.eclipse.org/legal/epl-v10.html -and a copy of the EDL is available at -http://www.eclipse.org/org/documents/edl-v10.php. -For purposes of the EPL, "Program" will mean the Content.
- -If you did not receive this Content directly from the Eclipse Foundation, the Content is -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at http://www.eclipse.org.
- - diff --git a/scripts/connectors/iotp/runiotpquickstart.sh b/scripts/connectors/iotp/runiotpquickstart.sh index f6c98149..c2c9ebbf 100755 --- a/scripts/connectors/iotp/runiotpquickstart.sh +++ b/scripts/connectors/iotp/runiotpquickstart.sh @@ -31,17 +31,6 @@ edgent=../../.. export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar -java org.apache.edgent.samples.connectors.iotp.IotpQuickstart - -# 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. # diff --git a/scripts/connectors/iotp/runiotpquickstart2.sh b/scripts/connectors/iotp/runiotpquickstart2.sh index fe3ace19..4a1ff9fc 100755 --- a/scripts/connectors/iotp/runiotpquickstart2.sh +++ b/scripts/connectors/iotp/runiotpquickstart2.sh @@ -29,14 +29,7 @@ edgent=../../.. # to see the data being sent from this sample to # IBM Watson IoT Platform Quickstart sample. -# 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 +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.