Merge branch 'wso2-master' into test-merge

# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/distribution/src/core/plugins/plugins-deployer.xml
#	modules/p2-profile/iot-core-profile/pom.xml
#	pom.xml

modules/distribution/pom.xml

@@ -777,6 +777,7 @@
 							<filters>
 								<filter>${basedir}/src/assembly/filter.properties</filter>
 							</filters>
+							<escapeString>\</escapeString>
 							<descriptors>
 								<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
 							</descriptors>

modules/distribution/src/assembly/bin.xml

@@ -323,7 +323,7 @@
             </outputDirectory>
         </fileSet>
 
-        <!-- Copying Authentication Endpoint webapp -->
+        <!-- Copying device type deployer files -->
         <fileSet>
             <directory>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/devicetypes
@@ -571,15 +571,6 @@
             </includes>
         </fileSet>
 
-        <fileSet>
-            <directory>../scripts/mobile-qsg/target</directory>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
-            </outputDirectory>
-            <includes>
-                <include>**/**.war</include>
-            </includes>
-        </fileSet>
         <!-- Files required to mobile-qsg -->
 
         <fileSet>
@@ -662,6 +653,7 @@
             <includes>
                 <include>*/**</include>
             </includes>
+			<filtered>true</filtered>
         </fileSet>
 
         <fileSet>
@@ -1332,6 +1324,12 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+		<file>
+			<source>src/core/resources/tenant/tenant-conf.json</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/tenant</outputDirectory>
+			<filtered>true</filtered>
+			<fileMode>644</fileMode>
+		</file>
         <!--License Config file-->
         <file>
             <source>
@@ -1430,15 +1428,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!-- Adding IoT Analytics Dashboard and gadget CApps -->
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/devicetypes/device_management/org_wso2_carbon_device_mgt_cdmf_analytics-1.0.0.car
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/
-            </outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying webapp-publisher-config.xml -->
         <file>
             <source>src/core/conf/etc/webapp-publisher-config.xml</source>
@@ -1565,12 +1554,6 @@
                 ${pom.artifactId}-${pom.version}/samples/mobile-qsg
             </outputDirectory>
         </file>
-        <file>
-            <source>../scripts/mobile-qsg/target/org.wso2.carbon.appmgt.oauth.core-1.2.5.jar</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/dropins
-            </outputDirectory>
-        </file>
         <file>
             <source>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml

modules/distribution/src/core/plugins/plugins-deployer.xml

@@ -50,8 +50,8 @@
                             <goal>p2-repo-gen</goal>
                         </goals>
                         <configuration>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
@@ -97,9 +97,9 @@
                         </goals>
                         <configuration>
                             <profile>default</profile>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
-                            <destination>${basedir}/../wso2/components</destination>
+                            <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <!-- Android Sense Device Type Features -->
@@ -152,9 +152,9 @@
                         </goals>
                         <configuration>
                             <profile>device-manager</profile>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
-                            <destination>${basedir}/../wso2/components</destination>
+                            <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <!-- Android Sense Device Type UI Feature -->
@@ -191,9 +191,9 @@
                         </goals>
                         <configuration>
                             <profile>device-backend</profile>
-                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
-                            <destination>${basedir}/../wso2/components</destination>
+                            <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <!-- Android Sense Device Type BE Features -->
@@ -304,6 +304,7 @@
     </repositories>
 
     <properties>
-        <carbon.device.mgt.plugin.version>3.0.33</carbon.device.mgt.plugin.version>
+		<!--This gets picked from the build properties, Do not change it-->
+        <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
     </properties>
 </project>

modules/distribution/src/core/resources/tenant/tenant-conf.json

@@ -0,0 +1,109 @@
+{
+  "EnableMonetization" : false,
+  "IsUnlimitedTierPaid" : false,
+  "ExtensionHandlerPosition": "bottom",
+  "RESTAPIScopes": {
+    "Scope": [
+      {
+        "Name": "apim:api_publish",
+        "Roles": "admin,Internal/publisher"
+      },
+      {
+        "Name": "apim:api_create",
+        "Roles": "admin,Internal/creator"
+      },
+      {
+        "Name": "apim:api_view",
+        "Roles": "admin,Internal/publisher,Internal/creator"
+      },
+      {
+        "Name": "apim:subscribe",
+        "Roles": "admin,Internal/subscriber"
+      },
+      {
+        "Name": "apim:tier_view",
+        "Roles": "admin,Internal/publisher,Internal/creator"
+      },
+      {
+        "Name": "apim:tier_manage",
+        "Roles": "admin"
+      },
+      {
+        "Name": "apim:bl_view",
+        "Roles": "admin"
+      },
+      {
+        "Name": "apim:bl_manage",
+        "Roles": "admin"
+      },
+      {
+        "Name": "apim:subscription_view",
+        "Roles": "admin,Internal/creator"
+      },
+      {
+        "Name": "apim:subscription_block",
+        "Roles": "admin,Internal/creator"
+      },
+      {
+        "Name": "apim:mediation_policy_view",
+        "Roles": "admin"
+      },
+      {
+        "Name": "apim:mediation_policy_create",
+        "Roles": "admin"
+      },
+      {
+        "Name": "apim:api_workflow",
+        "Roles": "admin"
+      },
+      {
+        "Name": "appm:publish",
+        "Roles": "admin,Internal/publisher"
+      },
+      {
+        "Name": "appm:read",
+        "Roles": "admin,Internal/creator,Internal/publisher,Internal/subscriber,Internal/store-admin,Internal/store"
+      },
+      {
+        "Name": "appm:create",
+        "Roles": "admin,Internal/creator"
+      },
+      {
+        "Name": "appm:subscribe",
+        "Roles": "admin,Internal/subscriber"
+      },
+      {
+        "Name": "appm:update",
+        "Roles": "admin,Internal/creator"
+      },
+      {
+        "Name": "appm:administration",
+        "Roles": "admin"
+      }
+    ]
+  },
+  "NotificationsEnabled":"false",
+  "Notifications":[{
+    "Type":"new_api_version",
+    "Notifiers" :[{
+      "Class":"org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier",
+      "ClaimsRetrieverImplClass":"org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever",
+      "Title": "Version $2 of $1 Released",
+      "Template": " <html> <body> <h3 style=\"color:Black;\">We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.</h3><a href=\"https://localhost:9443/store\">Click here to Visit WSO2 API Store</a></body></html>"
+    }]
+  }
+  ],
+  "DefaultRoles" : {
+    "PublisherRole" : {
+      "CreateOnTenantLoad" : true,
+      "RoleName" : "Internal/publisher"
+    },
+    "CreatorRole" : {
+      "CreateOnTenantLoad" : true,
+      "RoleName" : "Internal/creator"
+    },
+    "SubscriberRole" : {
+      "CreateOnTenantLoad" : true
+    }
+  }
+}

modules/p2-profile/iot-core-profile/pom.xml

@@ -175,6 +175,12 @@
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version}
+								</featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Device Management Plugin Features -->
 
@@ -465,6 +471,15 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
                                 </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.oauth.feature:${appmgt.feature.version}
+								</featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.store.feature:${appmgt.feature.version}
+								</featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.publisher.feature:${appmgt.feature.version}
+								</featureArtifactDef>
                                 <!-- APPM Features END -->
 
                                 <!-- Dashboards Features -->
@@ -886,6 +901,18 @@
                                     <id>org.wso2.carbon.social.feature.group</id>
                                     <version>${carbon.store.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.oauth.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
                                 <!-- End of app management features-->
 
                                 <!-- Device Management Features -->
@@ -980,6 +1007,14 @@
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Device Management Features -->
                                 <feature>
@@ -2006,6 +2041,10 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
@@ -2104,6 +2143,18 @@
                                     <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
+								<feature>
+									<id>org.wso2.carbon.appmgt.oauth.feature.group</id>
+									<version>${appmgt.feature.version}</version>
+								</feature>
                                 <!-- End of app management features-->
 
                                 <!-- Dashboard Features -->
@@ -2215,6 +2266,10 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -2904,6 +2959,10 @@
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+								<feature>
+									<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>

modules/scripts/mobile-qsg/pom.xml

@@ -63,72 +63,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>download-appm-store.war</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.rest.api.store/1.2.5/org.wso2.carbon.appmgt.rest.api.store-1.2.5.war"
-                                     dest="${project.build.directory}/api#appm#store#v1.1.war"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>download-appm-publisher.war</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.rest.api.publisher/1.2.5/org.wso2.carbon.appmgt.rest.api.publisher-1.2.5.war"
-                                     dest="${project.build.directory}/api#appm#publisher#v1.1.war"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>download-appm-ouath-webapp.war</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.oauth.webapp/1.2.5/org.wso2.carbon.appmgt.oauth.webapp-1.2.5.war"
-                                     dest="${project.build.directory}/api#appm#oauth#v1.0.war"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>download-appm-ouath-core.jar</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <get src="http://maven.wso2.org/nexus/content/groups/wso2-public/org/wso2/carbon/appmgt/org.wso2.carbon.appmgt.oauth.core/1.2.5/org.wso2.carbon.appmgt.oauth.core-1.2.5.jar"
-                                     dest="${project.build.directory}/"
-                                     verbose="false"
-                                     usetimestamp="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>

pom.xml

@@ -1513,7 +1513,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.59</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.61</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->