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

merging lakshani's changes on app-manager

Browse Source
merge-requests/1/head
lakshani 8 years ago committed by susinda
parent f3f1fc40cb
commit 14645232b8
2 changed files with 76 additions and 61 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 -->

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

@ -435,6 +435,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 -->
@ -462,9 +465,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 -->
@ -850,6 +850,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-->
@ -861,10 +865,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>
@ -1603,10 +1603,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>
@ -1619,6 +1615,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>
@ -2016,10 +2016,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>
@ -2032,6 +2028,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>
@ -2502,7 +2502,6 @@
<version>${product.iot.version}</version> <version>${product.iot.version}</version>
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<!-- App management features--> <!-- App management features-->
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.appmgt.core.feature.group</id>
@ -2512,33 +2511,21 @@
<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>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.publisher.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.services.api.feature.group</id> <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.store.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.store.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.social.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of app management features--> <!-- End of app management features-->
@ -3201,6 +3188,7 @@
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<<<<<<< HEAD
<!-- App management features--> <!-- App management features-->
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.appmgt.core.feature.group</id>
@ -3239,6 +3227,34 @@
<version>${carbon.store.version}</version> <version>${carbon.store.version}</version>
</feature> </feature>
<!-- End of app management features--> <!-- End of app management features-->
=======
<!-- App management features-->
<feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.services.api.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</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-->
>>>>>>> 6cd3950... Updated pom xmls accordding to rest connector
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>

Write Preview
Loading…
Cancel
Save