Merge branch 'master' of https://github.com/wso2/product-iot-server

8 years ago · 85c4e31a74
parent f48e03dec1 1c203e0f61
commit 85c4e31a74
18 changed files with 57 additions and 27 deletions
--- a/modules/analytics/distribution/pom.xml
+++ b/modules/analytics/distribution/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@ -7,16 +7,21 @@
        "ignoreProviders": ["rt"]
    },
    "authentication": {
-        "activeMethod": "basic",
+        "activeMethod": "sso",
        "methods": {
            "sso": {
                "attributes": {
-                    "issuer": "portal",
+                    "issuer": "analyticsportal",
                    "identityProviderURL": "https://localhost:9443/samlsso",
-                    "responseSigningEnabled": "false",
-                    "acs": "https://localhost:9444/portal/acs",
+                    "responseSigningEnabled": true,
+                    "validateAssertionValidityPeriod": true,
+                    "validateAudienceRestriction": true,
+                    "assertionSigningEnabled": true,
+                    "acs": "https://localhost:9445/portal/acs",
                    "identityAlias": "wso2carbon",
-                    "useTenantKey": false
+                    "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+                    "useTenantKey": false,
+                    "isPassive": false
                }
            },
            "basic": {
@ -33,14 +38,14 @@
                    "oauthProvider": {
                        "appRegistration": {
                            "appType": "webapp",
-                            "clientName": "portal",
+                            "clientName": "analyticsportal",
                            "owner": "admin",
                            "password":"admin",
                            "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
-                            "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
+                            "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
                            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
                            "tokenScope": "admin",
-                            "callbackUrl": "%https.host%/portal",
+                            "callbackUrl": "https://localhost:9445/portal",
                            "saasApp":true
                        },
                        "tokenServiceURL": "https://localhost:9443/oauth2/token"
@ -65,6 +70,15 @@
    "cacheSizeBytes": "1073741824",
    "defaultDashboardRedirect": false,
    "isCreateGadgetEnable": true,
+    "isSecureVaultEnabled" : false,
+    "assets": {
+        "gadget": {
+            "fileSizeLimit": 5
+        },
+        "layout": {
+            "fileSizeLimit": 1
+        }
+    },
    "oauth": {
        "username": "admin",
        "password": "admin"
@ -77,4 +91,4 @@
    "queryParameters" : {
        "passBetweenPages" : ["shared"]
    }
-}
+}
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/analytics/pom.xml
+++ b/modules/analytics/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/broker/distribution/pom.xml
+++ b/modules/broker/distribution/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-broker-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/broker/p2-profile/pom.xml
+++ b/modules/broker/p2-profile/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-broker-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/broker/pom.xml
+++ b/modules/broker/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/core/distribution/pom.xml
+++ b/modules/core/distribution/pom.xml
@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-core-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
@ -100,5 +100,21 @@
                <Recipient>https://localhost:9443/oauth2/token</Recipient>
            </RecipientList>
        </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>analyticsportal</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <EnableRecipients>true</EnableRecipients>
+            <AudiencesList>
+                <Audience>https://localhost:9443/oauth2/token</Audience>
+            </AudiencesList>
+            <RecipientList>
+                <Recipient>https://localhost:9443/oauth2/token</Recipient>
+            </RecipientList>
+        </ServiceProvider>
    </ServiceProviders>
 </SSOIdentityProviderConfig>
--- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-features</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/features/pom.xml
+++ b/modules/core/features/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/iotserver-ui/pom.xml
+++ b/modules/core/iotserver-ui/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
@ -20,13 +20,13 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-tools</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <name>WSO2 IoT - Device Type Archetype</name>
    <description>WSO2 IoT Device Type Archetype</description>
    <packaging>maven-archetype</packaging>
--- a/modules/core/tools/pom.xml
+++ b/modules/core/tools/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.iot</groupId>
        <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -23,7 +23,7 @@
    <groupId>org.wso2.iot</groupId>
    <artifactId>wso2iot-parent</artifactId>
    <packaging>pom</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
    <name>WSO2 IoT - Parent</name>
    <url>http://wso2.org</url>
    <description>WSO2 IoT Server</description>
@ -1531,7 +1531,7 @@
        <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>

        <!-- IOT Device Management -->
-        <product.iot.version>3.0.1-SNAPSHOT</product.iot.version>
+        <product.iot.version>3.0.0-SNAPSHOT</product.iot.version>

        <!-- Carbon Device Management Plugins-->
        <carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>