ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #405 from ayyoob/new-master2

Browse Source 
Added missing appm features/ installed android sense feature / fixed stats deploying issue
application-manager-new v3.1.0-M7
Amal Gunatilake 7 years ago committed by GitHub
parent ba9e27278f 59d84129e1
commit 9608d22ef6
7 changed files with 210 additions and 113 deletions
Show Stats Download Patch File Download Diff File

1
modules/distribution/pom.xml
Unescape View File

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

33
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -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>
@ -1327,6 +1319,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>
@ -1425,15 +1423,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/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>
@ -1560,12 +1549,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

46
modules/distribution/src/core/plugins/plugins-deployer.xml
Unescape View File

@ -46,22 +46,19 @@
<goal>p2-repo-gen</goal>
</goals>
<configuration>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:\${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
@ -74,26 +71,22 @@
</goals>
<configuration>
<profile>default</profile>
<metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
<destination>${basedir}/../wso2/components</destination>
<metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
<destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles>
<features>
<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.device.mgt.iot.arduino.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
<version>\${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
<version>\${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
<version>\${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
@ -110,11 +103,23 @@
<phase>package</phase>
<configuration>
<tasks>
<!--This is to have analytics artifacts in the super tenant space, In multi tenant environemnt,-->
<!--deploy it through the UI-->
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/resources/devicetypes">
<fileset dir="../repository/resources/devicetypes/arduino">
<include name="*.car"/>
</fileset>
</copy>
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/resources/devicetypes/raspberrypi">
<include name="*.car"/>
</fileset>
</copy>
<copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
<fileset dir="../repository/resources/devicetypes/virtual_firealarm">
<include name="*.car"/>
</fileset>
</copy>
<copy todir="../wso2/analytics/repository/deployment/server/">
<fileset dir="resources/analytics">
<include name="**/*"/>
@ -207,6 +212,7 @@
</repository>
</repositories>
<properties>
<carbon.device.mgt.plugin.version>3.0.31</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>

109
modules/distribution/src/core/resources/tenant/tenant-conf.json
Unescape View File

@ -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
}
}
}

64
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -176,6 +176,9 @@
<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.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- End of Device Management Plugin Features -->
<!-- IoT Device Management Features -->
@ -465,6 +468,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 -->
@ -902,6 +914,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 -->
@ -997,6 +1021,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>
<!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
@ -1955,6 +1983,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>
@ -2429,6 +2461,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>
@ -2527,6 +2563,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 -->
@ -2638,6 +2686,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.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>
@ -3097,6 +3149,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.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>
@ -3322,6 +3378,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.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>
@ -3761,6 +3821,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.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>

66
modules/scripts/mobile-qsg/pom.xml
Unescape View File

@ -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>

4
pom.xml
Unescape View File

@ -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 -->
@ -1521,7 +1521,7 @@
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.31</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>3.0.32</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save