community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #279 from lakshani/master

Browse Source 
Updated pom xmls accordding to rest connector
merge-requests/1/head
Geeth 8 years ago committed by GitHub
parent d83f7112d9 458a92e9c9
commit 23d5505f80
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File

13
modules/core/distribution/src/repository/conf/app-manager.xml
Unescape View File

@ -414,14 +414,13 @@
MDM running on separate JVM. Calls MDM methods via secured REST API. Use this when run Store/Publisher/MDM MDM running on separate JVM. Calls MDM methods via secured REST API. Use this when run Store/Publisher/MDM
in deployed in separate JVMs. This will be the most suitable active MDM when deployed on production environment. in deployed in separate JVMs. This will be the most suitable active MDM when deployed on production environment.
--> -->
<MDM name="WSO2MDM" bundle="org.wso2.carbon.appmgt.mdm.restconnector"> <MDM name="WSO2MDM_EXTERNAL_REST" bundle="org.wso2.carbon.appmgt.mdm.restconnector">
<Property name="ImageURL">/store/extensions/assets/mobileapp/resources/models/%s.png</Property> <Property name="ImageURL">/store/extensions/assets/mobileapp/resources/models/%s.png</Property>
<Property name="ServerURL">https://localhost:9443/mdm-admin</Property> <Property name="ServerURL">https://localhost:9443</Property>
<Property name="TokenApiURL">https://localhost:9443/oauth2/token</Property> <Property name="TokenApiURL">https://localhost:9443/oauth2</Property>
<Property name="ClientKey">WjLm24IxBVLF0oz0VJfmtJbjJbka</Property> <property name="Username">admin</property>
<Property name="ClientSecret">v3KkIQXkJ1SDp_Bf8uUQxu5p7TQa</Property> <property name="Password">admin</property>
<Property name="AuthUser">admin</Property> <property name="TokenRefreshTimeOffset">100</property>
<Property name="AuthPass">admin</Property>
</MDM> </MDM>
<!-- Old EMM, Calls EMM using REST API --> <!-- Old EMM, Calls EMM using REST API -->

46
modules/core/p2-profile-gen/pom.xml
Unescape View File

@ -429,6 +429,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Mobile Device Management Features END --> <!-- Mobile Device Management Features END -->
<!-- APPM Features --> <!-- APPM Features -->
@ -456,9 +459,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version} org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.restconnector.feature:${appmgt.feature.version}
</featureArtifactDef>
<!-- APPM Features END --> <!-- APPM Features END -->
<!-- Dashboards Features --> <!-- Dashboards Features -->
@ -835,6 +835,10 @@
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Mobile Features --> <!-- End of Mobile Features -->
<!-- App management features--> <!-- App management features-->
@ -850,10 +854,6 @@
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -1568,10 +1568,6 @@
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -1584,6 +1580,10 @@
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of app management features--> <!-- End of app management features-->
<feature> <feature>
<id>org.apache.axis2.transport.mail.feature.group</id> <id>org.apache.axis2.transport.mail.feature.group</id>
@ -1973,10 +1973,6 @@
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -1989,6 +1985,10 @@
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of app management features--> <!-- End of app management features-->
<feature> <feature>
<id>org.wso2.carbon.tenant.mgt.common.feature.group</id> <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
@ -2457,10 +2457,6 @@
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -2473,6 +2469,10 @@
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of app management features--> <!-- End of app management features-->
<!-- Dashboard Features --> <!-- Dashboard Features -->
@ -3115,10 +3115,6 @@
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
@ -3131,6 +3127,10 @@
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of app management features--> <!-- End of app management features-->
<!-- Device Management Features --> <!-- Device Management Features -->

4
pom.xml
Unescape View File

@ -1540,7 +1540,7 @@
<carbon.governance.version>4.7.0</carbon.governance.version> <carbon.governance.version>4.7.0</carbon.governance.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.11</carbon.device.mgt.version> <carbon.device.mgt.version>2.0.13</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
@ -1654,7 +1654,7 @@
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt.feature.version>1.2.14</appmgt.feature.version> <appmgt.feature.version>1.2.15</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.4.4</carbon.store.version> <carbon.store.version>1.4.4</carbon.store.version>

Write Preview
Loading…
Cancel
Save