Included the UI improvements to cdm jaggery app. Included the sso jaggery module dependency.

pom.xml

@@ -227,6 +227,7 @@
         <carbon.feature.version>1.1.0</carbon.feature.version>
         <process.feature.version>1.0.0</process.feature.version>
         <uuid.feature.version>1.0.0</uuid.feature.version>
+        <sso.feature.version>1.1.0-SNAPSHOT</sso.feature.version>
         <jaggery-test.feature.version>1.1.0</jaggery-test.feature.version>
         <!--Testing -->
         <test.framework.version>4.3.1</test.framework.version>

product/modules/distribution/src/repository/jaggeryapps/cdm/api/mobile/device-api.jag

@@ -0,0 +1,38 @@
+<%
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+var utility = require("/modules/utility.js");
+var deviceManagementService = utility.getDeviceManagementService();
+var devices = deviceManagementService.getAllDevices("android");
+var logger = new Log();
+var deviceList = [];
+for (i = 0; i < devices.size(); i++) {
+    var device = devices.get(i);
+    deviceList.push({
+        "identifier": device.getDeviceIdentifier(),
+        "name": device.getName(),
+        "ownership": device.getOwnership(),
+        "owner": device.getOwner(),
+        "deviceType": device.getType(),
+        "vendor": device.getProperties().get("vendor"),
+        "model": device.getProperties().get("model"),
+        "osVersion": device.getProperties().get("osVersion")
+    });
+}
+print(deviceList);
+%>

product/modules/distribution/src/repository/jaggeryapps/cdm/init.js

@@ -1 +1,32 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 //Init js to execute
+var logger = new Log();
+logger.debug("running debug");
+var app_TENANT_CONFIGS = 'tenant.configs';
+var app_carbon = require('carbon');
+var app_configs = {
+    "HTTPS_URL": "https://localhost:9443"
+};
+
+var app_server = new app_carbon.server.Server({
+    tenanted: app_configs.tenanted,
+    url: app_configs.HTTPS_URL + '/admin'
+});
+application.put("SERVER", app_server);
+application.put(app_TENANT_CONFIGS, {});

product/modules/distribution/src/repository/jaggeryapps/cdm/jaggery.conf

@@ -1,6 +1,6 @@
 {
     "welcomeFiles": ["pages/dashboard.jag"],
-    "initScripts": ["init.js"],
+    "initScripts": ["/init.js"],
     "urlMappings": [
         {
             "url": "/devices/*",
@@ -9,6 +9,10 @@
         {
             "url": "/dashboard",
             "path": "/pages/dashboard.jag"
+        },
+        {
+            "url": "/api/devices/mobile/*",
+            "path": "/api/mobile/device-api.jag"
         }
     ],
     "errorPages": {
@@ -16,5 +20,5 @@
         "404": "/error404.jag",
         "403": "/error403.jag "
     },
-    "logLevel": "info"
+    "logLevel": "debug"
 }

product/modules/distribution/src/repository/jaggeryapps/cdm/modules/utility.js

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//temporary
+
+var PrivilegedCarbonContext = Packages.org.wso2.carbon.context.PrivilegedCarbonContext,
+    Class = java.lang.Class;
+
+osgiService = function (clazz) {
+    return PrivilegedCarbonContext.getThreadLocalCarbonContext().getOSGiService(Class.forName(clazz));
+};
+var getDeviceManagementService= function(){
+    //server.authenticate("admin", "admin");
+    var realmService = osgiService('org.wso2.carbon.device.mgt.core.service.DeviceManagementService');
+    //var realmService = null;
+    return realmService;
+}

product/modules/distribution/src/repository/jaggeryapps/cdm/pages/dashboard.jag

@@ -1,5 +1,22 @@
 <!DOCTYPE html>
 <%
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 var title="WSO2 CDM";
 %>
 <html lang="en">
@@ -14,11 +31,24 @@ var title="WSO2 CDM";
             <div class="row">
                 <div class="col-sm-9 main col-centered">
                     <h2 class="sub-header">Devices list</h2>
+                    <!--
                     <div class="row">
                         <div class="col-md-1"><button type="button" class="btn btn-primary">Execute</button></div>
                     </div>
+                    -->
+                    <div role="devicepanel">
+
+                      <!-- Nav tabs -->
+                      <ul class="nav nav-tabs" role="tablist">
+                        <li role="presentation" class="active"><a href="#mobile" aria-controls="home" role="tab" data-toggle="tab">Mobile</a></li>
+                        <li role="presentation"><a href="#raspberrypi" aria-controls="profile" role="tab" data-toggle="tab">RaspberryPi</a></li>
+                      </ul>
+
+                      <!-- Tab panes -->
+                      <div class="tab-content">
+                        <div role="devicepanel" class="tab-pane active" id="mobile">
                             <div class="table-responsive">
-                        <table id="table-pagination" data-toggle="table" data-url="data2.json"  data-query-params="queryParams" data-height="400" data-pagination="true" data-search="true">
+                                <table id="table-pagination" data-toggle="table" data-url="/cdm/api/devices/mobile"  data-query-params="queryParams" data-height="400" data-pagination="true" data-search="true">
                                     <thead>
                                         <tr>
                                             <th data-field="state" data-checkbox="true"></th>
@@ -35,6 +65,11 @@ var title="WSO2 CDM";
                                 </table>
                             </div>
                         </div>
+                        <div role="devicepanel" class="tab-pane" id="raspberrypi">sdfweroiweuroi</div>
+                      </div>
+
+                    </div>
+                </div>
             </div>
         </div>
         <%

product/modules/distribution/src/repository/jaggeryapps/cdm/pages/device.jag

@@ -1,5 +1,22 @@
 <!DOCTYPE html>
 <%
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 var title="WSO2 CDM";
 %>
 <html lang="en">

product/modules/p2-profile-gen/pom.xml

@@ -127,6 +127,9 @@
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:uuid.feature:${uuid.feature.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:sso.feature:${sso.feature.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.jaggeryjs.modules:jaggery-test.feature:${jaggery-test.feature.version}
                                 </featureArtifactDef>
@@ -281,6 +284,10 @@
                                     <id>org.jaggeryjs.modules.uuid.feature.group</id>
                                     <version>${uuid.feature.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.sso.feature.group</id>
+                                    <version>${sso.feature.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.jaggeryjs.modules.jaggery-test.feature.group</id>
                                     <version>${jaggery-test.feature.version}</version>