You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dj...@apache.org on 2016/07/25 21:51:24 UTC
[7/7] incubator-quarks git commit: Merge branch 'pr-170'
Merge branch 'pr-170'
Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/54ea8ac4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/54ea8ac4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/54ea8ac4
Branch: refs/heads/master
Commit: 54ea8ac44e02deaf789852d462cf4e3786a5d8cc
Parents: 1153aad d771a06
Author: Dan Debrunner <dj...@apache.org>
Authored: Mon Jul 25 14:49:06 2016 -0700
Committer: Dan Debrunner <dj...@apache.org>
Committed: Mon Jul 25 14:49:06 2016 -0700
----------------------------------------------------------------------
build.xml | 6 +-
common-build.xml | 2 +-
connectors/.classpath | 20 +-
connectors/iotf/build.gradle | 22 --
connectors/iotf/build.xml | 49 ----
connectors/iotf/ext/lib/common-lang3.jar | Bin 646680 -> 0 bytes
connectors/iotf/ext/lib/commons-codec-1.10.jar | Bin 284184 -> 0 bytes
connectors/iotf/ext/lib/commons-logging-1.2.jar | Bin 61829 -> 0 bytes
connectors/iotf/ext/lib/commons-net-3.3.jar | Bin 280983 -> 0 bytes
connectors/iotf/ext/lib/httpclient-4.5.1.jar | Bin 732765 -> 0 bytes
connectors/iotf/ext/lib/httpcore-4.4.4.jar | Bin 326724 -> 0 bytes
connectors/iotf/ext/lib/joda-time-2.9.2.jar | Bin 625596 -> 0 bytes
....client.mqttv3-1.0.3-20150818.040635-202.jar | Bin 178148 -> 0 bytes
connectors/iotf/ext/watson-iot-0.1.1.jar | Bin 157618 -> 0 bytes
.../edgent/connectors/iotf/IotfDevice.java | 284 -------------------
.../edgent/connectors/iotf/package-info.java | 26 --
.../connectors/iotf/runtime/IotfConnector.java | 106 -------
.../iotf/runtime/IotfDeviceCommands.java | 50 ----
.../iotf/runtime/IotfDeviceEventsFixed.java | 46 ---
.../iotf/runtime/IotfDeviceEventsFunction.java | 54 ----
connectors/iotp/build.gradle | 22 ++
connectors/iotp/build.xml | 49 ++++
connectors/iotp/ext/lib/common-lang3.jar | Bin 0 -> 646680 bytes
connectors/iotp/ext/lib/commons-codec-1.10.jar | Bin 0 -> 284184 bytes
connectors/iotp/ext/lib/commons-logging-1.2.jar | Bin 0 -> 61829 bytes
connectors/iotp/ext/lib/commons-net-3.3.jar | Bin 0 -> 280983 bytes
connectors/iotp/ext/lib/httpclient-4.5.1.jar | Bin 0 -> 732765 bytes
connectors/iotp/ext/lib/httpcore-4.4.4.jar | Bin 0 -> 326724 bytes
connectors/iotp/ext/lib/joda-time-2.9.2.jar | Bin 0 -> 625596 bytes
....client.mqttv3-1.0.3-20150818.040635-202.jar | Bin 0 -> 178148 bytes
connectors/iotp/ext/watson-iot-0.1.1.jar | Bin 0 -> 157618 bytes
.../edgent/connectors/iotp/IotpDevice.java | 284 +++++++++++++++++++
.../edgent/connectors/iotp/package-info.java | 26 ++
.../connectors/iotp/runtime/IotpConnector.java | 106 +++++++
.../iotp/runtime/IotpDeviceCommands.java | 50 ++++
.../iotp/runtime/IotpDeviceEventsFixed.java | 46 +++
.../iotp/runtime/IotpDeviceEventsFunction.java | 54 ++++
platform/java7/build.xml | 12 +-
samples/connectors/build.gradle | 2 +-
samples/connectors/build.xml | 2 +-
.../samples/connectors/iotf/IotfQuickstart.java | 86 ------
.../samples/connectors/iotf/IotfSensors.java | 163 -----------
.../samples/connectors/iotf/package-info.java | 24 --
.../samples/connectors/iotp/IotpQuickstart.java | 86 ++++++
.../samples/connectors/iotp/IotpSensors.java | 163 +++++++++++
.../samples/connectors/iotp/package-info.java | 24 ++
samples/scenarios/build.gradle | 2 +-
samples/scenarios/build.xml | 4 +-
.../scenarios/iotf/IotfFullScenario.java | 92 ------
.../iotf/range/sensor/IotfRangeSensor.java | 219 --------------
.../scenarios/iotf/range/sensor/LED.java | 52 ----
.../scenarios/iotf/range/sensor/README.md | 32 ---
.../iotf/range/sensor/RangeSensor.java | 104 -------
.../iotf/range/sensor/SimulatedRangeSensor.java | 42 ---
.../scenarios/iotf/range/sensor/device.cfg | 5 -
.../scenarios/iotp/IotpFullScenario.java | 92 ++++++
.../iotp/range/sensor/IotpRangeSensor.java | 219 ++++++++++++++
.../scenarios/iotp/range/sensor/LED.java | 52 ++++
.../scenarios/iotp/range/sensor/README.md | 32 +++
.../iotp/range/sensor/RangeSensor.java | 104 +++++++
.../iotp/range/sensor/SimulatedRangeSensor.java | 42 +++
.../scenarios/iotp/range/sensor/device.cfg | 5 +
scripts/connectors/iotf/device.cfg | 7 -
scripts/connectors/iotf/runiotfquickstart.sh | 34 ---
scripts/connectors/iotf/runiotfsensors.sh | 35 ---
scripts/connectors/iotp/device.cfg | 7 +
scripts/connectors/iotp/runiotpquickstart.sh | 34 +++
scripts/connectors/iotp/runiotpsensors.sh | 35 +++
settings.gradle | 2 +-
test/svt/build.gradle | 2 +-
test/svt/build.xml | 2 +-
...eetManagementAnalyticsClientApplication.java | 4 +-
.../svt/apps/iotf/AbstractIotfApplication.java | 116 --------
.../svt/apps/iotp/AbstractIotpApplication.java | 116 ++++++++
74 files changed, 1678 insertions(+), 1678 deletions(-)
----------------------------------------------------------------------