diff --git a/README.md b/README.md index ba5c59f0..71df3498 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# product-device-cloud +# product-iot-server diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 66c45acc..d889730f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -21,18 +21,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.dc - wso2dc-parent + org.wso2.iot + wso2iot-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - wso2dc + wso2iot 1.0.0-SNAPSHOT pom - WSO2 Device Cloud (DC) - Distribution - WSO2 Device Cloud (DC) Distribution + WSO2 IoT Server - Distribution + WSO2 IoT Server Distribution + + + src/samples + @@ -364,17 +368,17 @@ - - - + + + - + - + ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components - wso2dc-${pom.version}/repository/components + wso2iot-${pom.version}/repository/components **/eclipse.ini **/*.lock diff --git a/modules/distribution/src/assembly/docs.xml b/modules/distribution/src/assembly/docs.xml index 5c7ff8ba..9590a630 100644 --- a/modules/distribution/src/assembly/docs.xml +++ b/modules/distribution/src/assembly/docs.xml @@ -25,11 +25,11 @@ target/site - wso2dc-${pom.version}-docs + wso2iot-${pom.version}-docs ../../modules/documentation/src/site/xdoc/user-core - wso2dc-${pom.version}-docs/user-core + wso2iot-${pom.version}-docs/user-core 755 user-mgt-actdir.xml diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties index 1dc01fef..9b5c9e59 100644 --- a/modules/distribution/src/assembly/filter.properties +++ b/modules/distribution/src/assembly/filter.properties @@ -1,4 +1,4 @@ -product.name=WSO2 Device Cloud +product.name=WSO2 IoT Server product.version=1.0.0-SNAPSHOT product.key=DC hotdeployment=true diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag index e7de6454..3ddcd0d3 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag @@ -118,13 +118,13 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) { } //URL: https://localhost:9443/devicecloud/manager/devices/username/{username} - deviceCloudService = carbonHttpsServletTransport + "/devicecloud/device_manager"; + deviceCloudService = carbonHttpsServletTransport + "/common/device_manager"; listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username; result = get(listAllDevicesEndPoint, {}, "json"); var ownDevices = result.data; var allDevices = []; - deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager"; + deviceCloudService = carbonHttpsServletTransport + "/common/group_manager"; var endPoint = deviceCloudService + "/group/all"; var data = {"username": user.username}; var groups = get(endPoint, data, "json").data; @@ -161,13 +161,13 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) { } //URL: https://localhost:9443/devicecloud/manager/devices/username/{username} - deviceCloudService = carbonHttpsServletTransport + "/devicecloud/device_manager"; + deviceCloudService = carbonHttpsServletTransport + "/common/device_manager"; listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username; result = get(listAllDevicesEndPoint, {}, "json"); var ownDevices = result.data; var allDevices = []; - deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager"; + deviceCloudService = carbonHttpsServletTransport + "/common/group_manager"; var endPoint = deviceCloudService + "/group/all"; var data = {"username": user.username}; var groups = get(endPoint, data, "json").data; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag index f0b419cb..2795e9e0 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag @@ -27,7 +27,7 @@ var dcProps = require('/config/dc-props.js').config(); var carbon = require('carbon'); var carbonHttpsServletTransport = carbon.server.address('https'); -var deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager"; +var deviceCloudService = carbonHttpsServletTransport + "/common/group_manager"; var user = session.get(constants.USER_SESSION_KEY); if (!user) { diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag index 30655bf0..52000469 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag @@ -38,7 +38,7 @@ if (!user) { var carbon = require('carbon'); var carbonHttpsServletTransport = carbon.server.address('https'); -var deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager"; +var deviceCloudService = carbonHttpsServletTransport + "/common/group_manager"; var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.analytics.statistics.IoTUsageStatisticsClient; var stats = {}; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js index 0e68d24b..c0cb4516 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js @@ -16,7 +16,7 @@ * under the License. */ -var WEB_APP_TITLE = "WSO2 DC - Device Cloud"; +var WEB_APP_TITLE = "WSO2 IoT - IoT Server"; var WEB_APP_CONTEXT = "/iotserver"; var USER_SESSION_KEY = "USER"; var UNSPECIFIED = "Unspecified"; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs index 3a282d01..39513dce 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs @@ -1,7 +1,7 @@ {{authorized}} {{layout "fluid"}} {{#zone "title"}} - WSO2 DC | Device Cloud + WSO2 IoT | IoT Server {{/zone}} {{#zone "body"}} {{unit "appbar" title="Dashboard"}} diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs index 329c878f..4f49ac6d 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs @@ -1,6 +1,6 @@ {{layout "fluid"}} {{#zone "title"}} - WSO2 DC | Device Cloud + WSO2 IoT | IoT Server {{/zone}} {{#zone "body"}} {{unit "appbar" link="dashboard" title="Device Management"}} diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs index 3653dae7..3e613f51 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs @@ -1,6 +1,6 @@ {{layout "fluid"}} {{#zone "title"}} -WSO2 Device Cloud | Login +WSO2 IoT Server | Login {{/zone}} {{#zone "body"}} {{unit "login"}} diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs index 1edb14be..5ce7b2b4 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs @@ -1,6 +1,6 @@ {{layout "fluid"}} {{#zone "title"}} -WSO2 Device Cloud | Register +WSO2 IoT Server | Register {{/zone}} {{#zone "body"}} {{unit "register"}} diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs index 858e1919..7bc67479 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs @@ -6,7 +6,7 @@

Android


Connect your Android - to the WSO2 device cloud.

+ to the WSO2 IoT server.

diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json index c5c8d764..e9476fe3 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json @@ -1,4 +1,4 @@ { "title" : "Android", - "description":"Connect Your Android mobile into the WSO2 Device Cloud Platform" + "description":"Connect Your Android mobile into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js index 37c03ca9..2e4000b5 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js @@ -38,7 +38,7 @@ function loadDeviceTypes() { //setting defaults var storeTitle = deviceType.name; - var storeDescription = "Connect your " + deviceType.name + " into the WSO2 Device Cloud Platform."; + var storeDescription = "Connect your " + deviceType.name + " into the WSO2 IoT Server."; if (deviceType.storeTitle != null) { storeTitle = deviceType.storeTitle; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js index 29e152a3..a10f7ed3 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js @@ -38,7 +38,7 @@ function loadDeviceTypes() { //setting defaults var storeTitle = deviceType.name; - var storeDescription = "Connect your " + deviceType.name + " into the WSO2 Device Cloud Platform."; + var storeDescription = "Connect your " + deviceType.name + " into the WSO2 IoT Server."; if (deviceType.storeTitle != null) { storeTitle = deviceType.storeTitle; diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json index d379da62..a3256aa5 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json @@ -1,4 +1,4 @@ { "title" : "Windows", - "description":"Connect Your Windows mobile into the WSO2 Device Cloud Platform" + "description":"Connect Your Windows mobile into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs index b19c41d0..51966cb3 100644 --- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs +++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs @@ -6,7 +6,7 @@

Windows


Connect your Windows Mobile - to the WSO2 device cloud.

+ to the WSO2 IoT server.

diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml index 0bebd287..e0b935e4 100644 --- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml +++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml @@ -11,17 +11,17 @@ ~ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-mgt - org.wso2.carbon.device.mgt.iot - 1.0.0-SNAPSHOT - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.android.sense.impl - 1.0.0-SNAPSHOT + org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl + ${carbon.iot.device.mgt.version} bundle WSO2 Carbon - Android Sense Management Impl WSO2 Carbon - Android Sense Management and Control Implementation @@ -51,8 +51,8 @@ ${project.artifactId} ${project.artifactId} ${carbon.iot.device.mgt.version} - Device Cloud Impl Bundle - org.wso2.carbon.device.mgt.iot.android.sense.internal + IoT Server Impl Bundle + org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.internal org.osgi.framework, org.osgi.service.component, @@ -69,31 +69,16 @@ org.wso2.carbon.device.mgt.common, org.wso2.carbon.context.*, org.wso2.carbon.ndatasource.core, - org.wso2.carbon.device.mgt.iot.common.* + org.wso2.carbon.device.mgt.iot.common.*, - !org.wso2.carbon.device.mgt.iot.android.sense.internal, - org.wso2.carbon.device.mgt.iot.android.sense.* + !org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.internal, + org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.* - - - - - - - - - - - - - - - @@ -120,22 +105,15 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - - - - - - - - - - - + org.wso2.carbon.device.mgt.iot org.wso2.carbon.device.mgt.iot.common + + - + + \ No newline at end of file diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java index 7e18284d..6f8d48c4 100644 --- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java +++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java @@ -26,6 +26,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl.dao.AndroidSenseDAO; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory; @@ -208,6 +210,16 @@ public class AndroidSenseManager implements DeviceManager { return false; } + @Override + public License getLicense(String s) throws LicenseManagementException { + return null; + } + + @Override + public void addLicense(License license) throws LicenseManagementException { + + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { boolean status; diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml index ed516635..e2a19220 100644 --- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml +++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml @@ -1,105 +1,107 @@ - - devicecloud-api - org.wso2.carbon.device.mgt.iot - 1.0.0 - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml + + 4.0.0 - org.wso2.carbon.device.mgt.iot.android.sense.api - 1.0.0 + org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl + ${carbon.iot.device.mgt.version} - war - WSO2 Carbon - Device Cloud API - Android SenseAPI + war + WSO2 Carbon - Android Sense API - Android Sense API - - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.common - provided - + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + provided + + + + org.apache.cxf + cxf-rt-frontend-jaxws + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + provided + + + org.apache.cxf + cxf-rt-transports-http + provided + + + + org.eclipse.paho + mqtt-client + provided + - - - org.apache.cxf - cxf-rt-frontend-jaxws - provided - - - org.apache.cxf - cxf-rt-frontend-jaxrs - provided - - - org.apache.cxf - cxf-rt-transports-http - provided - - - - org.eclipse.paho - mqtt-client - provided - + + + org.apache.httpcomponents + httpasyncclient + 4.1 + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + provided + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl + provided + + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + javax + javaee-web-api + provided + + + javax.ws.rs + jsr311-api + provided + + - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.common - provided - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.android.sense.impl - 1.0.0-SNAPSHOT - provided - - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-jaxrs - - - javax - javaee-web-api - provided - - - javax.ws.rs - jsr311-api - provided - - - - - - - - maven-compiler-plugin - - UTF-8 - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} - - - - maven-war-plugin - - android_sense - - - - + + + + maven-compiler-plugin + + UTF-8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + + + maven-war-plugin + + android_sense + + + + \ No newline at end of file diff --git a/modules/distribution/src/samples/android_sense/units/android_sense.hbs b/modules/distribution/src/samples/android_sense/units/android_sense.hbs index 1fc1f783..5fac269c 100644 --- a/modules/distribution/src/samples/android_sense/units/android_sense.hbs +++ b/modules/distribution/src/samples/android_sense/units/android_sense.hbs @@ -6,7 +6,7 @@

Android Sense


Connect your Android Sense - to the WSO2 device cloud.

+ to the WSO2 IoT server.

diff --git a/modules/distribution/src/samples/android_sense/units/public/store.json b/modules/distribution/src/samples/android_sense/units/public/store.json index 555be08e..f6143287 100644 --- a/modules/distribution/src/samples/android_sense/units/public/store.json +++ b/modules/distribution/src/samples/android_sense/units/public/store.json @@ -1,4 +1,4 @@ { "title" : "Android Sense", - "description":"Connect Your Android Sense into the WSO2 Device Cloud Platform" + "description":"Connect Your Android Sense into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml index df04156c..9a074d12 100644 --- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml +++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml @@ -11,131 +11,109 @@ ~ under the License. --> - - devicecloud-mgt - org.wso2.carbon.device.mgt.iot - 1.0.0-SNAPSHOT - ../pom.xml - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml + - 4.0.0 - org.wso2.carbon.device.mgt.iot.arduino.impl - 1.0.0-SNAPSHOT - bundle - WSO2 Carbon - Arduino Management Impl - WSO2 Carbon - Arduino Management and Control Implementation - http://wso2.org + 4.0.0 + org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl + ${carbon.iot.device.mgt.version} + bundle + WSO2 Carbon - Arduino Management Impl + WSO2 Carbon - Arduino Management and Control Implementation + http://wso2.org - - - - org.apache.felix - maven-scr-plugin - - - maven-compiler-plugin - - 1.7 - 1.7 - - 2.3.2 - - - org.apache.felix - maven-bundle-plugin - 1.4.0 - true - - - ${project.artifactId} - ${project.artifactId} - ${carbon.iot.device.mgt.version} - Device Cloud Impl Bundle - org.wso2.carbon.device.mgt.iot.arduino.internal - - org.osgi.framework, - org.osgi.service.component, - org.apache.commons.logging, - javax.xml.bind.*, - javax.naming, - javax.sql, - javax.xml.bind.annotation.*, - javax.xml.parsers, - javax.net, - javax.net.ssl, - org.w3c.dom, - org.wso2.carbon.device.mgt.common.*, - org.wso2.carbon.device.mgt.common, - org.wso2.carbon.context.*, - org.wso2.carbon.ndatasource.core, - org.wso2.carbon.device.mgt.iot.common.* - + + + + org.apache.felix + maven-scr-plugin + + + maven-compiler-plugin + + 1.7 + 1.7 + + 2.3.2 + + + org.apache.felix + maven-bundle-plugin + 1.4.0 + true + + + ${project.artifactId} + ${project.artifactId} + ${carbon.iot.device.mgt.version} + IoT Server Impl Bundle + org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.internal + + org.osgi.framework, + org.osgi.service.component, + org.apache.commons.logging, + javax.xml.bind.*, + javax.naming, + javax.sql, + javax.xml.bind.annotation.*, + javax.xml.parsers, + javax.net, + javax.net.ssl, + org.w3c.dom, + org.wso2.carbon.device.mgt.common.*, + org.wso2.carbon.device.mgt.common, + org.wso2.carbon.context.*, + org.wso2.carbon.ndatasource.core, + org.wso2.carbon.device.mgt.iot.common.*, + - - !org.wso2.carbon.device.mgt.iot.arduino.internal, - org.wso2.carbon.device.mgt.iot.arduino.* - + + !org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.internal, + org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.* + + + + + + - - - - - - - - - - - - - - - - - - - + + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.osgi + org.eclipse.osgi.services + - - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - + + org.wso2.carbon + org.wso2.carbon.logging + - - org.wso2.carbon - org.wso2.carbon.logging - + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + + + org.wso2.carbon + org.wso2.carbon.ndatasource.core + + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.common - - - org.wso2.carbon - org.wso2.carbon.ndatasource.core - - - - - - - - - - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.common - + - - + \ No newline at end of file diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java index 938606c0..724de461 100644 --- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java +++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java @@ -26,6 +26,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice; @@ -208,6 +210,16 @@ public class ArduinoManager implements DeviceManager { return false; } + @Override + public License getLicense(String s) throws LicenseManagementException { + return null; + } + + @Override + public void addLicense(License license) throws LicenseManagementException { + + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { boolean status; diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml index f44efe61..4fdf5f89 100644 --- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml +++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-api - org.wso2.carbon.device.mgt.iot - 1.0.0 - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.arduino.api - 1.0.0 + org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl + ${carbon.iot.device.mgt.version} war - WSO2 Carbon - Device Cloud API - Arduiono API + WSO2 Carbon - IoT Server API - Arduino API @@ -24,7 +24,6 @@ provided - org.apache.cxf @@ -49,15 +48,19 @@ - + + org.apache.httpcomponents + httpasyncclient + 4.1 + org.wso2.carbon.device.mgt.iot org.wso2.carbon.device.mgt.iot.common provided - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.arduino.impl + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl provided diff --git a/modules/distribution/src/samples/arduino/units/arduino.hbs b/modules/distribution/src/samples/arduino/units/arduino.hbs index 8096c3c6..fcf4c8a1 100644 --- a/modules/distribution/src/samples/arduino/units/arduino.hbs +++ b/modules/distribution/src/samples/arduino/units/arduino.hbs @@ -6,7 +6,7 @@

ArduinoUno


Connect your Arduino Uno device - to the WSO2 Device Cloud.

+ to the WSO2 IoT Server.

diff --git a/modules/distribution/src/samples/arduino/units/public/store.json b/modules/distribution/src/samples/arduino/units/public/store.json index 59b5a9f0..6de40dbe 100644 --- a/modules/distribution/src/samples/arduino/units/public/store.json +++ b/modules/distribution/src/samples/arduino/units/public/store.json @@ -1,4 +1,4 @@ { "title" : "Arduino", - "description":"Connect Your Arduino into the WSO2 Device Cloud Platform" + "description":"Connect Your Arduino into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml index fce18856..6e61e324 100644 --- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml +++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml @@ -11,20 +11,20 @@ ~ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-mgt - org.wso2.carbon.device.mgt.iot - 1.0.0-SNAPSHOT - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.digitaldisplay.impl - 1.0.0-SNAPSHOT + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl + ${carbon.iot.device.mgt.version} bundle - WSO2 Carbon - Digital Display Management Impl - WSO2 Carbon - digitaldisplay Management and Control Implementation + WSO2 Carbon - Digital display Management Impl + WSO2 Carbon - Digital display Management and Control Implementation http://wso2.org @@ -51,8 +51,8 @@ ${project.artifactId} ${project.artifactId} ${carbon.iot.device.mgt.version} - Device Cloud Impl Bundle - org.wso2.carbon.device.mgt.iot.digitaldisplay.internal + IoT Server Impl Bundle + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.internal org.osgi.framework, org.osgi.service.component, @@ -69,31 +69,16 @@ org.wso2.carbon.device.mgt.common, org.wso2.carbon.context.*, org.wso2.carbon.ndatasource.core, - org.wso2.carbon.device.mgt.iot.common.* + org.wso2.carbon.device.mgt.iot.common.*, - !org.wso2.carbon.device.mgt.iot.digitaldisplay.internal, - org.wso2.carbon.device.mgt.iot.digitaldisplay.* + !org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.internal, + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.* - - - - - - - - - - - - - - - @@ -120,22 +105,15 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - - - - - - - - - - - + org.wso2.carbon.device.mgt.iot org.wso2.carbon.device.mgt.iot.common + + - + + \ No newline at end of file diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java index ca57eedf..96fb9ad9 100644 --- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java +++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java @@ -28,6 +28,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice; @@ -212,6 +214,16 @@ public class DigitalDisplayManager implements DeviceManager return false; } + @Override + public License getLicense(String s) throws LicenseManagementException { + return null; + } + + @Override + public void addLicense(License license) throws LicenseManagementException { + + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { boolean status; diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml index 3d86d927..13166fb6 100644 --- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml +++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml @@ -1,100 +1,107 @@ - - devicecloud-api - org.wso2.carbon.device.mgt.iot - 1.0.0 - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml + + 4.0.0 - org.wso2.carbon.device.mgt.iot.digitaldisplay.api - 1.0.0 + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl + ${carbon.iot.device.mgt.version} - war - WSO2 Carbon - Device Cloud API - Digital Display API + war + WSO2 Carbon - Iot Server API - Digital Display API - - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.common - provided - + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + provided + - - - org.apache.cxf - cxf-rt-frontend-jaxws - provided - - - org.apache.cxf - cxf-rt-frontend-jaxrs - provided - - - org.apache.cxf - cxf-rt-transports-http - provided - + + + org.apache.cxf + cxf-rt-frontend-jaxws + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + provided + + + org.apache.cxf + cxf-rt-transports-http + provided + + + + org.eclipse.paho + mqtt-client + provided + + + + org.apache.httpcomponents + httpasyncclient + 4.1 + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + provided + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl + provided + + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + javax + javaee-web-api + provided + + + javax.ws.rs + jsr311-api + provided + + - - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.common - provided - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.digitaldisplay.impl - provided - - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-jaxrs - - - javax - javaee-web-api - provided - - - javax.ws.rs - jsr311-api - provided - - - - - - - - maven-compiler-plugin - - UTF-8 - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} - - - - maven-war-plugin - - digitaldisplay - - - - - + + + + maven-compiler-plugin + + UTF-8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + + + maven-war-plugin + + digital_display + + + + \ No newline at end of file diff --git a/modules/distribution/src/samples/digital_display/units/digital_display.hbs b/modules/distribution/src/samples/digital_display/units/digital_display.hbs index 983fb891..32e1f8d8 100644 --- a/modules/distribution/src/samples/digital_display/units/digital_display.hbs +++ b/modules/distribution/src/samples/digital_display/units/digital_display.hbs @@ -6,7 +6,7 @@

Digital Display


Connect your Digital Display device - to the WSO2 device cloud.

+ to the WSO2 IoT server.

diff --git a/modules/distribution/src/samples/digital_display/units/public/store.json b/modules/distribution/src/samples/digital_display/units/public/store.json index a08e07b4..9a136aa2 100644 --- a/modules/distribution/src/samples/digital_display/units/public/store.json +++ b/modules/distribution/src/samples/digital_display/units/public/store.json @@ -1,4 +1,4 @@ { "title" : "Digital Display", - "description":"Connect Your Digital Display into the WSO2 Device Cloud Platform" + "description":"Connect Your Digital Display into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml index 647fbe92..24ed5ebb 100644 --- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml +++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml @@ -13,15 +13,15 @@ - devicecloud-mgt - org.wso2.carbon.device.mgt.iot - 1.0.0-SNAPSHOT - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.firealarm.impl - 1.0.0-SNAPSHOT + org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl + ${carbon.iot.device.mgt.version} bundle WSO2 Carbon - Firealarm Management Impl WSO2 Carbon - Firealarm Management and Control Implementation @@ -51,8 +51,8 @@ ${project.artifactId} ${project.artifactId} ${carbon.iot.device.mgt.version} - Device Cloud Impl Bundle - org.wso2.carbon.device.mgt.iot.firealarm.internal + IoT Server Impl Bundle + org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.internal org.osgi.framework, org.osgi.service.component, @@ -73,26 +73,12 @@ - !org.wso2.carbon.device.mgt.iot.firealarm.internal, - org.wso2.carbon.device.mgt.iot.firealarm.* + !org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.internal, + org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.* - - - - - - - - - - - - - - @@ -119,16 +105,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - - - - - - - - - - + org.wso2.carbon.device.mgt.iot org.wso2.carbon.device.mgt.iot.common @@ -139,14 +116,4 @@ - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java index 9a6d0b1b..5aef6611 100644 --- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java +++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java @@ -23,6 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.*; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl.dao.FireAlarmDAO; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory; @@ -205,6 +207,16 @@ public class FireAlarmManager implements DeviceManager { return false; } + @Override + public License getLicense(String s) throws LicenseManagementException { + return null; + } + + @Override + public void addLicense(License license) throws LicenseManagementException { + + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { boolean status; diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml index e5618c76..d0644de2 100644 --- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml +++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-api - org.wso2.carbon.device.mgt.iot - 1.0.0 - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.firealarm.api - 1.0.0 + org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl + ${carbon.iot.device.mgt.version} war - WSO2 Carbon - Device Cloud API - Firealarm API + WSO2 Carbon - IoT Server API - Firealarm API @@ -59,8 +59,8 @@ provided - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.firealarm.impl + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl provided diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml index 5cc402a9..ee946a86 100755 --- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml +++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" metadata-complete="true"> - WSO2 Device Cloud - WSO2 Device Cloud + WSO2 IoT Server + WSO2 IoT Server CXFServlet diff --git a/modules/distribution/src/samples/firealarm/units/firealarm.hbs b/modules/distribution/src/samples/firealarm/units/firealarm.hbs index 55add972..8203eb94 100644 --- a/modules/distribution/src/samples/firealarm/units/firealarm.hbs +++ b/modules/distribution/src/samples/firealarm/units/firealarm.hbs @@ -6,7 +6,7 @@

Fire Alarm


Connect your Fire Alarm device - to the WSO2 device cloud.

+ to the WSO2 IoT server.

diff --git a/modules/distribution/src/samples/firealarm/units/public/store.json b/modules/distribution/src/samples/firealarm/units/public/store.json index 8fa78df4..64c6ddfe 100644 --- a/modules/distribution/src/samples/firealarm/units/public/store.json +++ b/modules/distribution/src/samples/firealarm/units/public/store.json @@ -1,4 +1,4 @@ { "title" : "Firealarm", - "description":"Connect Your Firealarm into the WSO2 Device Cloud Platform" + "description":"Connect Your Firealarm into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/samples/pom.xml b/modules/distribution/src/samples/pom.xml new file mode 100644 index 00000000..a92cf1cf --- /dev/null +++ b/modules/distribution/src/samples/pom.xml @@ -0,0 +1,577 @@ + + + + + + + 4.0.0 + org.wso2.carbon.device.mgt.iot.server.sample + iot-server-samples + pom + ${carbon.iot.device.mgt.version} + WSO2 Carbon - IoT Server Sample + http://wso2.org + WSO2 Carbon - IoT Server Sample + + + org.wso2 + wso2 + 1 + + + + firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl + firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl + android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl + android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl + arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl + arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl + digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl + digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl + raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl + raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl + sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl + sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl + + + + + + + org.wso2.carbon + org.wso2.carbon.logging + ${carbon.kernel.version} + + + org.apache.log4j.wso2 + log4j + + + commons-logging + commons-logging + + + org.wso2.carbon + org.wso2.carbon.bootstrap + + + provided + + + + org.wso2.carbon + org.wso2.carbon.ndatasource.core + ${carbon.kernel.version} + provided + + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.core + ${carbon.device.mgt.version} + provided + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + ${carbon.device.mgt.version} + provided + + + + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + ${carbon.iot.device.mgt.version} + provided + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl + ${carbon.iot.device.mgt.version} + provided + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl + ${carbon.iot.device.mgt.version} + war + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl + ${carbon.iot.device.mgt.version} + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl + ${carbon.iot.device.mgt.version} + war + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl + ${carbon.iot.device.mgt.version} + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl + ${carbon.iot.device.mgt.version} + war + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl + ${carbon.iot.device.mgt.version} + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl + ${carbon.iot.device.mgt.version} + war + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl + ${carbon.iot.device.mgt.version} + provided + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl + ${carbon.iot.device.mgt.version} + war + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl + ${carbon.iot.device.mgt.version} + + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl + ${carbon.iot.device.mgt.version} + war + + + + org.eclipse.paho + mqtt-client + ${eclipse.paho.version} + provided + + + javax + javaee-web-api + 6.0 + provided + + + org.codehaus.jackson + jackson-core-asl + ${jackson.version} + provided + + + org.codehaus.jackson + jackson-jaxrs + ${jackson.version} + provided + + + + + org.eclipse.osgi + org.eclipse.osgi + ${eclipse.osgi.version} + provided + + + org.eclipse.equinox + org.eclipse.equinox.common + ${eclipse.equinox.common.version} + provided + + + org.testng + testng + ${testng.version} + + + junit + junit + + + org.beanshell + bsh + + + org.yaml + snakeyaml + + + provided + + + org.eclipse.osgi + org.eclipse.osgi.services + 3.3.100.v20120522-1822 + provided + + + + + com.h2database.wso2 + h2-database-engine + ${orbit.h2.engine.version} + provided + + + org.apache.tomcat.wso2 + jdbc-pool + ${orbit.tomcat.jdbc.pooling.version} + provided + + + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + ${cxf.version} + provided + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + provided + + + javax.ws.rs + jsr311-api + ${javax.ws.rs.version} + provided + + + + + commons-httpclient.wso2 + commons-httpclient + ${commons-httpclient.orbit.version} + provided + + + + org.json.wso2 + json + ${commons-json.version} + provided + + + + + + + + + 1.0.0 + + + + 4.4.0 + [4.4.0, 4.5.0) + + + + + 1.3 + + + 4.3.1 + 6.8 + + + 3.6.100.v20120522-1841 + 3.8.1.v20120830-144521 + + + 1.2.140.wso2v3 + 7.0.52.wso2v5 + 7.0.34.wso2v2 + + 0.4.0 + + + + + 2.6.1 + 1.9.0 + 1.1.1 + + + + + + 0.9.2-SNAPSHOT + [0.8.0, 2.0.0) + + + 1.0.0-SNAPSHOT + + + 3.1.0.wso2v2 + 3.0.0.wso2v1 + + + + + 1.7 + 1.7 + + + + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.1 + + + + + + org.jvnet.maven.incrementalbuild + incremental-build-plugin + 1.3 + + + + incremental-build + + + + + + org.apache.maven.plugins + maven-release-plugin + + clean install + false + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + + + org.apache.felix + maven-scr-plugin + 1.7.2 + + + generate-scr-scrdescriptor + + scr + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.5 + true + + NONE + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar-no-fork + + + + + + maven-assembly-plugin + 2.2-beta-2 + + + maven-resources-plugin + 2.6 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.4 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + org.apache.maven.plugins + maven-compiler-plugin + + UTF-8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + 2.3.2 + + + org.apache.maven.plugins + maven-war-plugin + 2.2 + + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} + + + + + + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + + wso2.snapshots + Apache Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + + + + + wso2-nexus + WSO2 internal Repository + http://maven.wso2.org/nexus/content/groups/wso2-public/ + + true + daily + ignore + + + + + wso2.releases + WSO2 internal Repository + http://maven.wso2.org/nexus/content/repositories/releases/ + + true + daily + ignore + + + + + wso2.snapshots + WSO2 Snapshot Repository + http://maven.wso2.org/nexus/content/repositories/snapshots/ + + true + daily + + + false + + + + + + \ No newline at end of file diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml index db36fd67..16d34b9d 100644 --- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml +++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml @@ -11,20 +11,20 @@ ~ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-mgt - org.wso2.carbon.device.mgt.iot - 1.0.0-SNAPSHOT - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.raspberrypi.impl - 1.0.0-SNAPSHOT + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl + ${carbon.iot.device.mgt.version} bundle - WSO2 Carbon - RaspberryPi Management Impl - WSO2 Carbon - Raspberrypi Management and Control Implementation + WSO2 Carbon - Raspberry Management Impl + WSO2 Carbon - Raspberry Management and Control Implementation http://wso2.org @@ -51,8 +51,8 @@ ${project.artifactId} ${project.artifactId} ${carbon.iot.device.mgt.version} - Device Cloud Impl Bundle - org.wso2.carbon.device.mgt.iot.raspberrypi.internal + IoT Server Impl Bundle + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.internal org.osgi.framework, org.osgi.service.component, @@ -73,26 +73,12 @@ - !org.wso2.carbon.device.mgt.iot.raspberrypi.internal, - org.wso2.carbon.device.mgt.iot.raspberrypi.* + !org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.internal, + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.* - - - - - - - - - - - - - - @@ -119,16 +105,7 @@ org.wso2.carbon org.wso2.carbon.ndatasource.core - - - - - - - - - - + org.wso2.carbon.device.mgt.iot org.wso2.carbon.device.mgt.iot.common @@ -137,4 +114,6 @@ - + + + \ No newline at end of file diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java index 540ec899..83f280b1 100644 --- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java +++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java @@ -28,6 +28,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice; @@ -211,6 +213,16 @@ public class RaspberrypiManager implements DeviceManager { return false; } + @Override + public License getLicense(String s) throws LicenseManagementException { + return null; + } + + @Override + public void addLicense(License license) throws LicenseManagementException { + + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { boolean status; diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml index c9e7024d..d0f8b1ae 100644 --- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml +++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml @@ -1,101 +1,107 @@ - - devicecloud-api - org.wso2.carbon.device.mgt.iot - 1.0.0 - ../pom.xml - - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml + + 4.0.0 - org.wso2.carbon.device.mgt.iot.raspberrypi.api - 1.0.0 + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl + ${carbon.iot.device.mgt.version} - war - WSO2 Carbon - Device Cloud API - Raspberrypi API + war + WSO2 Carbon - IoT Server API - RaspberryPi API - - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.common - provided - + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + provided + - - - org.apache.cxf - cxf-rt-frontend-jaxws - provided - - - org.apache.cxf - cxf-rt-frontend-jaxrs - provided - - - org.apache.cxf - cxf-rt-transports-http - provided - + + + org.apache.cxf + cxf-rt-frontend-jaxws + provided + + + org.apache.cxf + cxf-rt-frontend-jaxrs + provided + + + org.apache.cxf + cxf-rt-transports-http + provided + + + + org.eclipse.paho + mqtt-client + provided + - - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.common - provided - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.raspberrypi.impl - provided - - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-jaxrs - - - javax - javaee-web-api - provided - - - javax.ws.rs - jsr311-api - provided - - - - - - - - - maven-compiler-plugin - - UTF-8 - ${wso2.maven.compiler.source} - ${wso2.maven.compiler.target} - - - - maven-war-plugin - - raspberrypi - - - - - + + + org.apache.httpcomponents + httpasyncclient + 4.1 + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + provided + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl + provided + + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + javax + javaee-web-api + provided + + + javax.ws.rs + jsr311-api + provided + + + + + + maven-compiler-plugin + + UTF-8 + ${wso2.maven.compiler.source} + ${wso2.maven.compiler.target} + + + + maven-war-plugin + + raspberrypi + + + + \ No newline at end of file diff --git a/modules/distribution/src/samples/raspberrypi/units/public/store.json b/modules/distribution/src/samples/raspberrypi/units/public/store.json index 862b7a58..c3672c24 100644 --- a/modules/distribution/src/samples/raspberrypi/units/public/store.json +++ b/modules/distribution/src/samples/raspberrypi/units/public/store.json @@ -1,4 +1,4 @@ { "title" : "Raspberry Pi", - "description":"Connect Your Raspberry Pi into the WSO2 Device Cloud Platform" + "description":"Connect Your Raspberry Pi into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs index d5a5185c..8d07ee4c 100644 --- a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs +++ b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs @@ -6,7 +6,7 @@

Raspberry Pi


Connect your Raspberry Pi device - to the WSO2 Device Cloud.

+ to the WSO2 IoT Server.

diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml index 9387190f..db19e39b 100644 --- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml +++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml @@ -11,17 +11,17 @@ ~ under the License. --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-mgt - org.wso2.carbon.device.mgt.iot - 1.0.0-SNAPSHOT - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - org.wso2.carbon.device.mgt.iot.sensebot.impl - 1.0.0-SNAPSHOT + org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl + ${carbon.iot.device.mgt.version} bundle WSO2 Carbon - Sensebot Management Impl WSO2 Carbon - Sensebot Management and Control Implementation @@ -51,8 +51,8 @@ ${project.artifactId} ${project.artifactId} ${carbon.iot.device.mgt.version} - Device Cloud Impl Bundle - org.wso2.carbon.device.mgt.iot.sensebot.internal + IoT Server Impl Bundle + org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.internal org.osgi.framework, org.osgi.service.component, @@ -73,68 +73,47 @@ - !org.wso2.carbon.device.mgt.iot.sensebot.internal, - org.wso2.carbon.device.mgt.iot.sensebot.* + !org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.internal, + org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.* - - - - - - - - - - - - - - - - org.eclipse.osgi - org.eclipse.osgi - - - org.eclipse.osgi - org.eclipse.osgi.services - + + org.eclipse.osgi + org.eclipse.osgi + + + org.eclipse.osgi + org.eclipse.osgi.services + - - org.wso2.carbon - org.wso2.carbon.logging - + + org.wso2.carbon + org.wso2.carbon.logging + - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.mgt.common - - - org.wso2.carbon - org.wso2.carbon.ndatasource.core - - - - - - - - - - - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.common - + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.common + + + org.wso2.carbon + org.wso2.carbon.ndatasource.core + + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + - + + + \ No newline at end of file diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java index 8145c855..98f26ac3 100644 --- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java +++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java @@ -28,6 +28,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice; @@ -209,6 +211,16 @@ public class SensebotManager implements DeviceManager { return false; } + @Override + public License getLicense(String s) throws LicenseManagementException { + return null; + } + + @Override + public void addLicense(License license) throws LicenseManagementException { + + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { boolean status; diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml index 87449a37..5d51dfbf 100644 --- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml +++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml @@ -3,19 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - devicecloud-api - org.wso2.carbon.device.mgt.iot - 1.0.0 - ../pom.xml + iot-server-samples + org.wso2.carbon.device.mgt.iot.server.sample + ${carbon.iot.device.mgt.version} + ../../../pom.xml 4.0.0 - - org.wso2.carbon.device.mgt.iot.sensebot.api - 1.0.0 + org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl + ${carbon.iot.device.mgt.version} war - WSO2 Carbon - Device Cloud API - Sensebot API + WSO2 Carbon - IoT Server API - Sensebot API @@ -25,23 +24,6 @@ provided - - - - org.apache.httpcomponents - httpasyncclient - 4.1 - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.common - provided - - - org.wso2.carbon.device.mgt.iot - org.wso2.carbon.device.mgt.iot.sensebot.impl - provided - org.apache.cxf @@ -64,6 +46,23 @@ mqtt-client provided + + + + org.apache.httpcomponents + httpasyncclient + 4.1 + + + org.wso2.carbon.device.mgt.iot + org.wso2.carbon.device.mgt.iot.common + provided + + + org.wso2.carbon.device.mgt.iot.server.sample + org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl + provided + org.codehaus.jackson @@ -85,12 +84,6 @@ - - - Eclipse Paho Repo - http://repo.spring.io/plugins-release/ - - diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml index 5cc402a9..ee946a86 100755 --- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml +++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" metadata-complete="true"> - WSO2 Device Cloud - WSO2 Device Cloud + WSO2 IoT Server + WSO2 IoT Server CXFServlet diff --git a/modules/distribution/src/samples/sensebot/units/public/store.json b/modules/distribution/src/samples/sensebot/units/public/store.json index 508e9477..11a10f31 100644 --- a/modules/distribution/src/samples/sensebot/units/public/store.json +++ b/modules/distribution/src/samples/sensebot/units/public/store.json @@ -1,4 +1,4 @@ { "title" : "Sensebot", - "description":"Connect Your Sensebot into the WSO2 Device Cloud Platform" + "description":"Connect Your Sensebot into the WSO2 IoT Server" } \ No newline at end of file diff --git a/modules/distribution/src/samples/sensebot/units/sensebot.hbs b/modules/distribution/src/samples/sensebot/units/sensebot.hbs index 01a02016..d4ae8792 100644 --- a/modules/distribution/src/samples/sensebot/units/sensebot.hbs +++ b/modules/distribution/src/samples/sensebot/units/sensebot.hbs @@ -6,7 +6,7 @@

Sensebot


Connect your Sensebot - to the WSO2 device cloud.

+ to the WSO2 IoT server.

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 8a722e2b..7438f4c6 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -20,15 +20,15 @@ - org.wso2.dc - wso2dc-parent + org.wso2.iot + wso2iot-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - wso2dc-integration - WSO2 DC - Integration Tests + wso2iot-integration + WSO2 IoT Server - Integration Tests pom diff --git a/modules/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml index 1d0c207b..7bc1451b 100644 --- a/modules/integration/tests-artifacts/pom.xml +++ b/modules/integration/tests-artifacts/pom.xml @@ -19,17 +19,17 @@ - org.wso2.dc - wso2dc-integration + org.wso2.iot + wso2iot-integration 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.dc + org.wso2.iot tests-artifacts pom - WSO2 DC Integration Test Common + WSO2 IoT Server Integration Test Common diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index 5b0973e0..e2b29d37 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -20,15 +20,15 @@ - org.wso2.dc + org.wso2.iot tests-common 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.dc - org.wso2.carbon.dc.integration.common.clients + org.wso2.iot + org.wso2.carbon.iot.integration.common.clients jar WSO2 MDM - Integration Admin Clients diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml index 5e1273e1..880dfd9c 100644 --- a/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/modules/integration/tests-common/integration-test-utils/pom.xml @@ -20,17 +20,17 @@ - org.wso2.dc + org.wso2.iot tests-common 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.carbon.dc.integration.common.utils - org.wso2.dc + org.wso2.carbon.iot.integration.common.utils + org.wso2.iot jar - WSO2 DC - Integration Test Utils + WSO2 IoT Server - Integration Test Utils diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index a65cbe7c..7b8b66b8 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -19,17 +19,17 @@ - org.wso2.dc - wso2dc-integration + org.wso2.iot + wso2iot-integration 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.dc + org.wso2.iot tests-common pom - WSO2 DC Integration Test Common + WSO2 IoT Server Integration Test Common admin-clients diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml index 6cd90357..44f49cdc 100644 --- a/modules/integration/tests-common/ui-pages/pom.xml +++ b/modules/integration/tests-common/ui-pages/pom.xml @@ -22,15 +22,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.dc + org.wso2.iot tests-common 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.dc - org.wso2.carbon.dc.integration.ui.pages + org.wso2.iot + org.wso2.carbon.iot.integration.ui.pages jar WSO2 MDM - Integration Test UI Pages diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index c150907f..b2afc246 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -19,17 +19,17 @@ - org.wso2.dc - wso2dc-integration + org.wso2.iot + wso2iot-integration 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.dc + org.wso2.iot tests-integration pom - WSO2 MDM Backend Integration Tests + WSO2 IoT Server Integration Tests diff --git a/modules/integration/tests-platform/pom.xml b/modules/integration/tests-platform/pom.xml index f3f21958..0b9b59d4 100644 --- a/modules/integration/tests-platform/pom.xml +++ b/modules/integration/tests-platform/pom.xml @@ -19,17 +19,17 @@ - org.wso2.dc - wso2dc-integration + org.wso2.iot + wso2iot-integration 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - org.wso2.dc + org.wso2.iot tests-platform pom - WSO2 DC Platform Integration Tests + WSO2 IoT Server Integration Tests diff --git a/modules/integration/tests-ui-integration/pom.xml b/modules/integration/tests-ui-integration/pom.xml index 1e6ef5a7..8a1532a2 100644 --- a/modules/integration/tests-ui-integration/pom.xml +++ b/modules/integration/tests-ui-integration/pom.xml @@ -20,15 +20,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.dc - wso2dc-integration + org.wso2.iot + wso2iot-integration 1.0.0-SNAPSHOT ../pom.xml 4.0.0 - WSO2 DC - Integration Test UI Module - org.wso2.carbon.dc.integration.test.ui.integration + WSO2 IoT Server - Integration Test UI Module + org.wso2.carbon.iot.integration.test.ui.integration jar @@ -62,7 +62,7 @@ carbon.zip - ${basedir}/../../distribution/target/wso2dc-${project.version}.zip + ${basedir}/../../distribution/target/wso2iot-${project.version}.zip @@ -130,8 +130,8 @@ - org.wso2.dc - wso2dc + org.wso2.iot + wso2iot ${project.version} zip true @@ -192,7 +192,7 @@ - ${basedir}/target/tobeCopied/wso2dc-${project.version}/repository/resources/security/ + ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/ **/*.jks @@ -213,7 +213,7 @@ - ${basedir}/target/tobeCopied/wso2dc-${project.version}/repository/conf/axis2/ + ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/ **/*.xml @@ -234,7 +234,7 @@ - ${basedir}/target/tobeCopied/wso2dc-${project.version}/repository/deployment/client/modules + ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/deployment/client/modules **/*.mar @@ -250,8 +250,8 @@ - org.wso2.dc - org.wso2.carbon.dc.integration.ui.pages + org.wso2.iot + org.wso2.carbon.iot.integration.ui.pages org.wso2.carbon.automation diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index ba4725ca..c99c7bc9 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -20,15 +20,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.wso2.dc - wso2dc-parent + org.wso2.iot + wso2iot-parent 1.0.0-SNAPSHOT ../../pom.xml 4.0.0 - wso2dc-profile-gen - WSO2 Device Cloud (DC) - P2 Profile Gen + wso2iot-profile-gen + WSO2 IoT Server - P2 Profile Gen pom diff --git a/pom.xml b/pom.xml index 8318625a..e38c4e03 100644 --- a/pom.xml +++ b/pom.xml @@ -21,13 +21,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.wso2.dc - wso2dc-parent + org.wso2.iot + wso2iot-parent pom 1.0.0-SNAPSHOT - WSO2 DC - Parent + WSO2 IoT - Parent http://wso2.org - WSO2 Device Cloud + WSO2 IoT Server org.wso2 @@ -158,12 +158,7 @@ - - org.wso2.dc - org.wso2.carbon.dc.integration.ui.pages - ${mdm.version} - test - +