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

Adding the changes for the product

Browse Source
merge-requests/1/head
geethkokila 6 years ago
parent 7dfcfc118c
commit 5f4ed2ff18
4 changed files with 324 additions and 225 deletions
Show Stats Download Patch File Download Diff File

116
modules/distribution/pom.xml
Unescape View File

@ -534,76 +534,76 @@
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" /> <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" /> <property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" /> <property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE" /> <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue"> <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" /> <classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" /> <classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" /> <classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql" /> <fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/application-mgt/h2.sql" />
</sql> </sql>
<echo message="##################### END ####################" /> <echo message="##################### END ####################" />
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution> <!--<execution>-->
<!-- Creating JAGH2 schema --> <!--&lt;!&ndash; Creating JAGH2 schema &ndash;&gt;-->
<id>create-JAGH2-schema</id> <!--<id>create-JAGH2-schema</id>-->
<phase>package</phase> <!--<phase>package</phase>-->
<goals> <!--<goals>-->
<goal>run</goal> <!--<goal>run</goal>-->
</goals> <!--</goals>-->
<configuration> <!--<configuration>-->
<tasks> <!--<tasks>-->
<echo message="########### Create JAGH2 Schema ###########" /> <!--<echo message="########### Create JAGH2 Schema ###########" />-->
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" /> <!--<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />-->
<property name="userid" value="wso2carbon" /> <!--<property name="userid" value="wso2carbon" />-->
<property name="password" value="wso2carbon" /> <!--<property name="password" value="wso2carbon" />-->
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" /> <!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />-->
<!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />--> <!--&lt;!&ndash;<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />&ndash;&gt;-->
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue"> <!--<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">-->
<classpath refid="maven.dependency.classpath" /> <!--<classpath refid="maven.dependency.classpath" />-->
<classpath refid="maven.compile.classpath" /> <!--<classpath refid="maven.compile.classpath" />-->
<classpath refid="maven.runtime.classpath" /> <!--<classpath refid="maven.runtime.classpath" />-->
<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" /> <!--<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />-->
</sql> <!--</sql>-->
<echo message="##################### END ####################" /> <!--<echo message="##################### END ####################" />-->
</tasks> <!--</tasks>-->
</configuration> <!--</configuration>-->
</execution> <!--</execution>-->
<execution> <!--<execution>-->
<!-- Creating Social DB schema --> <!--&lt;!&ndash; Creating Social DB schema &ndash;&gt;-->
<id>create-social-db-schema</id> <!--<id>create-social-db-schema</id>-->
<phase>package</phase> <!--<phase>package</phase>-->
<goals> <!--<goals>-->
<goal>run</goal> <!--<goal>run</goal>-->
</goals> <!--</goals>-->
<configuration> <!--<configuration>-->
<tasks> <!--<tasks>-->
<echo message="########### Create Social Plugin H2 Schema ###########" /> <!--<echo message="########### Create Social Plugin H2 Schema ###########" />-->
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" /> <!--<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />-->
<property name="userid" value="wso2carbon" /> <!--<property name="userid" value="wso2carbon" />-->
<property name="password" value="wso2carbon" /> <!--<property name="password" value="wso2carbon" />-->
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" /> <!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />-->
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue"> <!--<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">-->
<classpath refid="maven.dependency.classpath" /> <!--<classpath refid="maven.dependency.classpath" />-->
<classpath refid="maven.compile.classpath" /> <!--<classpath refid="maven.compile.classpath" />-->
<classpath refid="maven.runtime.classpath" /> <!--<classpath refid="maven.runtime.classpath" />-->
<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" /> <!--<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />-->
</sql> <!--</sql>-->
<echo message="##################### END ####################" /> <!--<echo message="##################### END ####################" />-->
</tasks> <!--</tasks>-->
</configuration> <!--</configuration>-->
</execution> <!--</execution>-->
<execution> <execution>
<!-- Creating Android Mobile Plugin Management schema --> <!-- Creating Android Mobile Plugin Management schema -->
<id>create-mobile-android-plugin-mgt-schema</id> <id>create-mobile-android-plugin-mgt-schema</id>

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

@ -1433,10 +1433,10 @@
<!-- Copying H2 database related files corresponding to default App management repository schema --> <!-- Copying H2 database related files corresponding to default App management repository schema -->
<file> <file>
<source> <source>
target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2APPM_DB.h2.db target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_APPM_DB.h2.db
</source> </source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
<destName>WSO2APPM_DB.h2.db</destName> <destName>WSO2DM_APPM_DB.h2.db</destName>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- Copying H2 database related files corresponding to default Device management repository schema --> <!-- Copying H2 database related files corresponding to default Device management repository schema -->
@ -1701,14 +1701,14 @@
${pom.artifactId}-${pom.version}/conf/ ${pom.artifactId}-${pom.version}/conf/
</outputDirectory> </outputDirectory>
</file> </file>
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml <!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml-->
</source> <!--</source>-->
<outputDirectory> <!--<outputDirectory>-->
${pom.artifactId}-${pom.version}/conf/ <!--${pom.artifactId}-${pom.version}/conf/-->
</outputDirectory> <!--</outputDirectory>-->
</file> <!--</file>-->
<file> <file>
<source> <source>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/entitlement.properties ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/entitlement.properties
@ -1717,14 +1717,14 @@
${pom.artifactId}-${pom.version}/conf/identity ${pom.artifactId}-${pom.version}/conf/identity
</outputDirectory> </outputDirectory>
</file> </file>
<file> <!--<file>-->
<source> <!--<source>-->
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/lifecycles/MobileAppLifeCycle.xml <!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/lifecycles/MobileAppLifeCycle.xml-->
</source> <!--</source>-->
<outputDirectory> <!--<outputDirectory>-->
${pom.artifactId}-${pom.version}/repository/resources/lifecycles <!--${pom.artifactId}-${pom.version}/repository/resources/lifecycles-->
</outputDirectory> <!--</outputDirectory>-->
</file> <!--</file>-->
<file> <file>
<source>src/core/samples/connectedcup-samples-deployer.xml</source> <source>src/core/samples/connectedcup-samples-deployer.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>

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

@ -454,49 +454,70 @@
</featureArtifactDef> </featureArtifactDef>
<!-- Mobile Device Management Features --> <!-- Mobile Device Management Features -->
<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> <!--<featureArtifactDef>-->
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version} <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version}-->
</featureArtifactDef> <!--</featureArtifactDef>-->
<!-- Mobile Device Management Features END --> <!-- Mobile Device Management Features END -->
<!-- APPM Features --> <!-- APPM Features -->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}-->
<!--</featureArtifactDef>-->
<!--<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 -->
<!-- New App Manager Features-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.feature:${carbon.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.store.ui.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.oauth.feature:${appmgt.feature.version} <!-- End of New App Manager Features-->
</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 --> <!-- Dashboards Features -->
<featureArtifactDef> <featureArtifactDef>
@ -912,62 +933,91 @@
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<!-- Mobile Features --> <!-- Mobile Features -->
<feature> <!--<feature>-->
<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> <!--<feature>-->
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id> <!--<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>-->
<version>${carbon.device.mgt.plugin.version}</version> <!--<version>${carbon.device.mgt.plugin.version}</version>-->
</feature> <!--</feature>-->
<!-- End of Mobile Features --> <!-- End of Mobile Features -->
<!-- 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.publisher.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.store.feature.group</id>-->
<!--<version>${carbon.store.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.store.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<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-->
<!-- New App Manager Features-->
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.device.application.mgt.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${carbon.device.mgt.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.publisher.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.services.api.feature.group</id> <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.store.feature.group</id> <id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.store.feature.group</id> <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.social.feature.group</id> <id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id> <!-- End of New App Manager Features-->
<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 --> <!-- Device Management Features -->
<feature> <feature>
@ -1997,43 +2047,72 @@
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<!-- 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>-->
<!--<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-->
<!-- New App Manager Features-->
<!--<feature>-->
<!--<id>org.wso2.carbon.device.application.mgt.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${appmgt.feature.version}</version> <version>${carbon.device.mgt.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>
<!--<feature>-->
<!--<id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>-->
<!--<version>${carbon.device.mgt.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id> <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id> <!--<feature>-->
<version>${appmgt.feature.version}</version> <!--<id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>-->
</feature> <!--<version>${carbon.device.mgt.version}</version>-->
<feature> <!--</feature>-->
<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>
<version>${appmgt.feature.version}</version> <!-- End of New App Manager Features-->
</feature>
<feature>
<id>org.wso2.carbon.appmgt.oauth.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<!-- End of app management features-->
<!-- Dashboard Features --> <!-- Dashboard Features -->
<feature> <feature>
@ -2271,10 +2350,10 @@
<id>org.wso2.carbon.service.mgt.server.feature.group</id> <id>org.wso2.carbon.service.mgt.server.feature.group</id>
<version>${carbon.deployment.version}</version> <version>${carbon.deployment.version}</version>
</feature> </feature>
<feature> <!--<feature>-->
<id>org.wso2.carbon.social.feature.group</id> <!--<id>org.wso2.carbon.social.feature.group</id>-->
<version>${carbon.store.version}</version> <!--<version>${carbon.store.version}</version>-->
</feature> <!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.registry.core.feature.group</id> <id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.registry.version}</version> <version>${carbon.registry.version}</version>
@ -2654,49 +2733,69 @@
<id>org.wso2.iot.core.styles.feature.group</id> <id>org.wso2.iot.core.styles.feature.group</id>
<version>${project.version}</version> <version>${project.version}</version>
</feature> </feature>
<!-- End of IoTServer Features -->
<!-- App management features--> <!-- New App Manager 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.publisher.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.store.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.appmgt.store.feature.group</id>
<version>${appmgt.feature.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.social.feature.group</id> <id>org.wso2.carbon.device.application.mgt.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id> <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id> <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of New App Manager Features-->
<!-- End of IoTServer 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.publisher.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.store.feature.group</id>-->
<!--<version>${carbon.store.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.store.feature.group</id>-->
<!--<version>${appmgt.feature.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.social.feature.group</id>-->
<!--<version>${carbon.store.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--> <!-- End of app management features-->
<feature> <feature>

6
pom.xml
Unescape View File

@ -42,7 +42,7 @@
<module>modules/cxf-filters</module> <module>modules/cxf-filters</module>
<module>modules/p2-profile</module> <module>modules/p2-profile</module>
<module>modules/distribution</module> <module>modules/distribution</module>
<module>modules/integration</module> <!--<module>modules/integration</module>-->
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@ -1528,14 +1528,14 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.1.37</carbon.device.mgt.version> <carbon.device.mgt.version>3.1.40-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.1.8</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.1.9-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save