Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0

revert-70aa11f8
geethkokila 8 years ago
commit bce1395182

@ -1,16 +1,36 @@
{ {
"appContext": "/devicemgt/", "appContext": "/devicemgt/",
"isCloud": false, "isCloud": false,
"httpsURL" : "https://%iot.gateway.host%:%iot.gateway.https.port%", "cloudConfig": {
"httpURL" : "http://%iot.gateway.host%:%iot.gateway.http.port", "upgradeNowURL": "",
"wssURL" : "https://%iot.analytics.host%:%iot.analytics.https.port%", "monetizationURL": "",
"requestExtensionURL": "",
"publisherURL": "",
"storeURL": "",
"contactUsURL": "",
"apiCloudDocURL": "https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation",
"appCloudDocURL": "https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation",
"deviceCloudDocURL": "https://docs.wso2.com/display/DeviceCloud/WSO2+Device+Cloud+Documentation",
"apiCloudWalkthroughURL": "https://api.clouddev.wso2.com/publisher?interactiveTutorial=true",
"profileURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag",
"changePasswordURL": "https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag",
"logoutURL": "https://api.clouddev.wso2.com/publisher/site/pages/logout.jag",
"apiCloudURL": "",
"appCloudURL": "",
"deviceCloudURL": "",
"oraganizationURL": "",
"membersURL": ""
},
"httpsURL": "https://%iot.gateway.host%:%iot.gateway.https.port%",
"httpURL": "http://%iot.gateway.host%:%iot.gateway.http.port",
"wssURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",
"portalURL": "https://%iot.analytics.host%:%iot.analytics.https.port%", "portalURL": "https://%iot.analytics.host%:%iot.analytics.https.port%",
"dashboardServerURL" : "%https.ip%", "dashboardServerURL": "%https.ip%",
"androidEnrollmentDir": "/android-web-agent/enrollment", "androidEnrollmentDir": "/android-web-agent/enrollment",
"windowsEnrollmentDir": "/windows-web-agent/enrollment", "windowsEnrollmentDir": "/windows-web-agent/enrollment",
"iOSEnrollmentDir": "/ios-web-agent/enrollment", "iOSEnrollmentDir": "/ios-web-agent/enrollment",
"iOSConfigRoot" : "%https.ip%/ios-enrollment/", "iOSConfigRoot": "%https.ip%/ios-enrollment/",
"iOSAPIRoot" : "%https.ip%/ios/", "iOSAPIRoot": "%https.ip%/ios/",
"adminService": "%https.ip%", "adminService": "%https.ip%",
"gatewayEnabled": true, "gatewayEnabled": true,
"oauthProvider": { "oauthProvider": {
@ -27,41 +47,41 @@
}, },
"tokenServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/token" "tokenServiceURL": "https://%iot.gateway.host%:%iot.gateway.https.port%/token"
}, },
"adminUser":"admin@carbon.super", "adminUser": "admin@carbon.super",
"adminUserTenantId":"-1234", "adminUserTenantId": "-1234",
"adminRole":"admin", "adminRole": "admin",
"userValidationConfig" : { "userValidationConfig": {
"usernameLength":30, "usernameLength": 30,
"usernameJSRegEx" : "^[\\S]{3,30}$", "usernameJSRegEx": "^[\\S]{3,30}$",
"usernameRegExViolationErrorMsg" : "Provided username is invalid.", "usernameRegExViolationErrorMsg": "Provided username is invalid.",
"usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.", "usernameHelpMsg": "Should be in minimum 3 characters long and do not include any whitespaces.",
"firstnameJSRegEx" : "^.{3,30}$", "firstnameJSRegEx": "^.{3,30}$",
"firstnameRegExViolationErrorMsg" : "Provided first name is invalid.", "firstnameRegExViolationErrorMsg": "Provided first name is invalid.",
"lastnameJSRegEx" : "^.{3,30}$", "lastnameJSRegEx": "^.{3,30}$",
"lastnameRegExViolationErrorMsg" : "Provided last name is invalid.", "lastnameRegExViolationErrorMsg": "Provided last name is invalid.",
"emailJSRegEx" : "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/", "emailJSRegEx": "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/",
"emailRegExViolationErrorMsg" : "Provided email is invalid." "emailRegExViolationErrorMsg": "Provided email is invalid."
}, },
"groupValidationConfig": { "groupValidationConfig": {
"groupNameJSRegEx": "^[\\S]{3,30}$", "groupNameJSRegEx": "^[\\S]{3,30}$",
"groupNameRegExViolationErrorMsg": "Provided group name is invalid.", "groupNameRegExViolationErrorMsg": "Provided group name is invalid.",
"groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces." "groupNameHelpMsg": "Should be in minimum 3 characters long and should not include any whitespaces."
}, },
"roleValidationConfig" : { "roleValidationConfig": {
"roleNameJSRegEx" : "^[\\S]{3,30}$", "roleNameJSRegEx": "^[\\S]{3,30}$",
"roleNameRegExViolationErrorMsg" : "Provided role name is invalid.", "roleNameRegExViolationErrorMsg": "Provided role name is invalid.",
"roleNameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces." "roleNameHelpMsg": "should be in minimum 3 characters long and do not include any whitespaces."
}, },
"generalConfig" : { "generalConfig": {
"host" : "%http.ip%", "host": "%http.ip%",
"companyName" : "WSO2 Carbon Device Manager", "companyName": "WSO2 Carbon Device Manager",
"browserTitle" : "WSO2 Device Manager", "browserTitle": "WSO2 Device Manager",
"copyrightPrefix" : "\u00A9 %date-year%, ", "copyrightPrefix": "\u00A9 %date-year%, ",
"copyrightOwner" : "WSO2 Inc.", "copyrightOwner": "WSO2 Inc.",
"copyrightOwnersSite" : "http://www.wso2.org", "copyrightOwnersSite": "http://www.wso2.org",
"copyrightSuffix" : " All Rights Reserved." "copyrightSuffix": " All Rights Reserved."
}, },
"scopes" : [ "scopes": [
"perm:sign-csr", "perm:sign-csr",
"perm:admin:devices:view", "perm:admin:devices:view",
"perm:roles:add", "perm:roles:add",
@ -178,8 +198,8 @@
"perm:admin", "perm:admin",
"perm:devicetype:deployment" "perm:devicetype:deployment"
], ],
"isOAuthEnabled" : true, "isOAuthEnabled": true,
"backendRestEndpoints" : { "backendRestEndpoints": {
"deviceMgt" : "/api/device-mgt/v1.0" "deviceMgt": "/api/device-mgt/v1.0"
} }
} }

@ -48,7 +48,7 @@
<li> <li>
<a title="Upgrade Now" <a title="Upgrade Now"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/payment-plans.jag?cloud-type=device_cloud" href="{{upgradeNowURL}}"
target="_self"> target="_self">
<i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now <i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now
</a> </a>
@ -56,7 +56,7 @@
<li> <li>
<a title="Monetization" <a title="Monetization"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/monetization-dashboard.jag" href="{{monetizationURL}}"
target="_self"> target="_self">
<i class="fa fa-money fa-lg" title="Monetization"></i> Monetization <i class="fa fa-money fa-lg" title="Monetization"></i> Monetization
</a> </a>
@ -64,7 +64,7 @@
<li> <li>
<a title="Request Extension" <a title="Request Extension"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&amp;request-extension=true" href="{{requestExtensionURL}}"
target="_blank"> target="_blank">
<i class="fw fw-mail" title="Request Extension"></i> Request Extension <i class="fw fw-mail" title="Request Extension"></i> Request Extension
</a> </a>
@ -82,20 +82,20 @@
<span class="hidden-xs"> <span class="hidden-xs">
App Management App Management
</span> </span>
<!--<span class="caret"></span>--> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown" <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
role="menu"> role="menu">
<li class="visible-inline-block"> <li class="visible-inline-block">
<a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher" <a title="Mobile App Publisher" href="{{publisherURL}}"
target="_self"> target="_self">
<i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
</a> </a>
</li> </li>
<li class="visible-inline-block"> <li class="visible-inline-block">
<a title="App Store " href="https://devicemgt.clouddev.wso2.com/store" <a title="App Store " href="{{storeURL}}"
target="_self"> target="_self">
<i class="fw fw-store" title="App Store"></i> App Store <i class="fw fw-store" title="App Store"></i> App Store
</a> </a>
@ -105,7 +105,7 @@
</li> </li>
<li class="visible-inline-block"> <li class="visible-inline-block">
<a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self" <a href="{{contactUsURL}}" target="_self"
title="Support"> title="Support">
@ -136,7 +136,7 @@
<li> <li>
<a title="API Cloud" <a title="API Cloud"
href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation" href="{{apiCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-api" title="API Cloud"></i> API Cloud <i class="fw fw-api" title="API Cloud"></i> API Cloud
</a> </a>
@ -144,15 +144,15 @@
<li> <li>
<a title="App Cloud" <a title="App Cloud"
href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation" href="{{appCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-application" title="App Cloud"></i> App Cloud <i class="fw fw-application" title="App Cloud"></i> App Cloud
</a> </a>
</li> </li>
<li> <li>
<a title="App Cloud" <a title="Device Cloud"
href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation" href="{{deviceCloudDocURL}}"
target="_blank"> target="_blank">
<i class="fw fw-application" title="App Cloud"></i> Device Cloud <i class="fw fw-application" title="App Cloud"></i> Device Cloud
</a> </a>
@ -160,7 +160,7 @@
<li> <li>
<a title="API Cloud Walkthrough" <a title="API Cloud Walkthrough"
href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true" href="{{apiCloudWalkthroughURL}}"
target="_self"> target="_self">
<i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough <i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough
</a> </a>
@ -187,7 +187,7 @@
<li> <li>
<a title="Profile" <a title="Profile"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag" href="{{profileURL}}"
target="_self"> target="_self">
<i class="fw fw-user" title="Profile"></i> Profile <i class="fw fw-user" title="Profile"></i> Profile
</a> </a>
@ -195,14 +195,14 @@
<li> <li>
<a title="Change Password" <a title="Change Password"
href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag" href="{{changePasswordURL}}"
target="_self"> target="_self">
<i class="fw fw-lock" title="Change Password"></i> Change Password <i class="fw fw-lock" title="Change Password"></i> Change Password
</a> </a>
</li> </li>
<li> <li>
<a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag" <a title="Logout" href="{{logoutURL}}"
target="_self"> target="_self">
<i class="fw fw-sign-out" title="Logout"></i> Logout <i class="fw fw-sign-out" title="Logout"></i> Logout
</a> </a>
@ -229,17 +229,17 @@
<div id="popover-content" class="hide"> <div id="popover-content" class="hide">
<div class="cloud-apps"> <div class="cloud-apps">
<a href="https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{apiCloudURL}}https://api.cloud.wso2.com/publisher" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-api fw-3x"></i> <i class="fw fw-api fw-3x"></i>
<div class="cloud-name">API Cloud</div> <div class="cloud-name">API Cloud</div>
</a> </a>
<a href="https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{appCloudURL}}https://apps.cloud.wso2.com/appmgt" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-application fw-3x"></i> <i class="fw fw-application fw-3x"></i>
<div class="cloud-name">App Cloud</div> <div class="cloud-name">App Cloud</div>
</a> </a>
<a href="https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x"> <a href="{{deviceCloudURL}}https://devicemgt.cloud.wso2.com/devicemgt" target="_self" class="cloud-block add-padding-top-3x">
<i class="fw fw-mobile fw-3x"></i> <i class="fw fw-mobile fw-3x"></i>
<div class="cloud-name">Device Cloud</div> <div class="cloud-name">Device Cloud</div>
</a> </a>
@ -249,12 +249,12 @@
<div class="cloud-actions"> <div class="cloud-actions">
<h3>Manage your cloud</h3> <h3>Manage your cloud</h3>
<a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x"> <a href="{{oraganizationURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/organization.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
<i class="fw fw-organization fw-3x"></i> <i class="fw fw-organization fw-3x"></i>
<div class="cloud-name">Organization</div> <div class="cloud-name">Organization</div>
</a> </a>
<a href="https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x"> <a href="{{membersURL}}https://cloudmgt.cloud.wso2.com/cloudmgt/site/pages/user.jag" target="_self" class="cloud-block-invert add-padding-top-3x">
<i class="fa fa-users fa-3x"></i> <i class="fa fa-users fa-3x"></i>
<div class="cloud-name">Members</div> <div class="cloud-name">Members</div>
</a> </a>

Loading…
Cancel
Save