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

removing common/base modules & refactoring

Browse Source
application-manager-new
Ace 8 years ago
parent 647262b652
commit c9c717af1c
6 changed files with 423 additions and 31 deletions
Show Stats Download Patch File Download Diff File

62
modules/distribution/pom.xml
Unescape View File

@ -30,8 +30,8 @@
<artifactId>wso2iots</artifactId> <artifactId>wso2iots</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>WSO2 IoT Server - Distribution</name> <name>WSO2 IoT - Distribution</name>
<description>WSO2 IoT Server Distribution</description> <description>WSO2 IoT Distribution</description>
<dependencies> <dependencies>
<dependency> <dependency>
@ -175,6 +175,64 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution>
<!-- Creating JAGH2 schema -->
<id>create-JAGH2-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create JAGH2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" 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}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />-->
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution>
<!-- Creating Social DB schema -->
<id>create-social-db-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create Social Plugin H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" 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" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution> <execution>
<id>3-extract-docs-from-components</id> <id>3-extract-docs-from-components</id>
<phase>package</phase> <phase>package</phase>

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

@ -198,6 +198,7 @@
<include>**/i18n/</include> <include>**/i18n/</include>
<include>**/ws/</include> <include>**/ws/</include>
<include>**/appmgtpublisher/</include> <include>**/appmgtpublisher/</include>
<include>**/store/</include>
<include>**/lifecycle/</include> <include>**/lifecycle/</include>
<include>**/utils/</include> <include>**/utils/</include>
<include>**/caramel/</include> <include>**/caramel/</include>
@ -302,17 +303,69 @@
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<!-- Copying APP management related dbscripts -->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/storage</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/appmgt</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!-- Copying Social plugin related dbscripts --> <!-- Copying Social plugin related dbscripts -->
<fileSet> <fileSet>
<directory> <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social</directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/social</outputDirectory>
</directory> <includes>
<include>*/**</include>
</includes>
</fileSet>
<!-- Copying Social plugin related MSSQL dbscripts from distribution src-->
<fileSet>
<directory>src/repository/dbscripts/social</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/social</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/social</outputDirectory>
<includes> <includes>
<include>*/**</include> <include>*/**</include>
</includes> </includes>
</fileSet> </fileSet>
<!-- Copying storage related MSSQL dbscripts from distribution src-->
<fileSet>
<directory>src/repository/dbscripts/storage</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/storage</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!--Copying modules-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<fileSet>
<directory>src/repository/modules/sso</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/sso</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!-- This is for APPM -->
<!-- This has been done to address a flaw in the APPM publisher feature -->
<fileSet>
<directory>src/repository/modules/lifecycle</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/modules/lifecycle</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!--Copying modules--> <!--Copying modules-->
<fileSet> <fileSet>
@ -485,6 +538,11 @@
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/social/</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>src/api-resources/synapse-configs/default/sequences</directory> <directory>src/api-resources/synapse-configs/default/sequences</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
@ -963,6 +1021,13 @@
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!--app management config file-->
<file>
<source>src/repository/conf/app-manager.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!--License Config file--> <!--License Config file-->
<file> <file>
<source> <source>
@ -1250,6 +1315,14 @@
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!-- Copying product specific log4j.properties that has unnecessary logs printed by third parties <!-- Copying product specific log4j.properties that has unnecessary logs printed by third parties
components suppressed --> components suppressed -->
<file> <file>

37
modules/distribution/src/repository/conf/datasources/master-datasources.xml
Unescape View File

@ -84,5 +84,42 @@
</configuration> </configuration>
</definition> </definition>
</datasource> </datasource>
<datasource>
<name>JAGH2</name>
<description>The datasource used for by the Jaggery Storage Manager</description>
<jndiConfig>
<name>jdbc/ES_Storage</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
</configuration>
</definition>
</datasource>
<datasource>
<name>WSO2_SOCIAL_DB</name>
<description>The datasource used for Store social database</description>
<jndiConfig>
<name>jdbc/WSO2_SOCIAL_DB</name>
</jndiConfig>
<definition type="RDBMS">
<configuration>
<url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</url>
<username>wso2carbon</username>
<password>wso2carbon</password>
<driverClassName>org.h2.Driver</driverClassName>
<maxActive>50</maxActive>
<maxWait>60000</maxWait>
<testOnBorrow>true</testOnBorrow>
<validationQuery>SELECT 1</validationQuery>
<validationInterval>30000</validationInterval>
</configuration>
</definition>
</datasource>
</datasources> </datasources>
</datasources-configuration> </datasources-configuration>

26
modules/distribution/src/samples-deployer.xml
Unescape View File

@ -67,6 +67,12 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.devicetypes.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.devicetypes.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -103,6 +109,16 @@
<id>org.wso2.carbon.device.mgt.iot.devicetypes.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.devicetypes.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- Mobile Features -->
<feature>
<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.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Mobile Features -->
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -139,6 +155,16 @@
<id>org.wso2.carbon.device.mgt.iot.devicetypes.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.devicetypes.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- Mobile Features -->
<feature>
<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.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Mobile Features -->
</features> </features>
</configuration> </configuration>
</execution> </execution>

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

@ -150,10 +150,7 @@
<!-- IoT Device Management Features --> <!-- IoT Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.url.printer.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.adapter.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
@ -394,6 +391,42 @@
org.wso2.iot:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature:${carbon.iot.device.mgt.version} org.wso2.iot:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature:${carbon.iot.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Mobile Device Management Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Mobile Device Management Features END -->
<!-- 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.mdm.restconnector.feature:${appmgt.feature.version}
</featureArtifactDef>
<!-- APPM Features END -->
<!-- Mediation Features --> <!-- Mediation Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version} org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
@ -836,6 +869,51 @@
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of IoTServer Features --> <!-- End of IoTServer Features -->
<!-- Mobile Features -->
<feature>
<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Mobile 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.store.feature.group</id>
<version>${carbon.store.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.mdm.restconnector.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.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>
<!-- End of app management features-->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
@ -903,13 +981,8 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.url.printer.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.adapter.feature.group</id> <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- Carbon Deployment Features --> <!-- Carbon Deployment Features -->
@ -1582,6 +1655,32 @@
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of IoTServer 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.mdm.restconnector.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>
<!-- End of app management features-->
<feature> <feature>
<id>org.wso2.carbon.logging.mgt.feature.group</id> <id>org.wso2.carbon.logging.mgt.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -1766,6 +1865,32 @@
<id>org.wso2.iot.styles.feature.group</id> <id>org.wso2.iot.styles.feature.group</id>
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- 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.mdm.restconnector.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>
<!-- 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>
<version>${axis2-transports.wso2.version}</version> <version>${axis2-transports.wso2.version}</version>
@ -2120,6 +2245,32 @@
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of IoTServer 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.mdm.restconnector.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>
<!-- 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>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2540,6 +2691,35 @@
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of IoTServer 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.mdm.restconnector.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>
<!-- End of app management features-->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.feature.group</id> <id>org.wso2.carbon.device.mgt.feature.group</id>
@ -2606,13 +2786,8 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.url.printer.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.adapter.feature.group</id> <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
@ -3088,6 +3263,34 @@
<version>${carbon.iot.device.mgt.version}</version> <version>${carbon.iot.device.mgt.version}</version>
</feature> </feature>
<!-- End of IoTServer 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.mdm.restconnector.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>
<!-- End of app management features-->
<!-- Device Management Features --> <!-- Device Management Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.feature.group</id> <id>org.wso2.carbon.device.mgt.feature.group</id>
@ -3154,13 +3357,8 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- End of Device Management Features --> <!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.url.printer.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.adapter.feature.group</id> <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>

6
pom.xml
Unescape View File

@ -1020,6 +1020,7 @@
<artifactId>andes</artifactId> <artifactId>andes</artifactId>
<version>${carbon.messaging.version}</version> <version>${carbon.messaging.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -1154,11 +1155,10 @@
<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.2</appmgt.feature.version> <appmgt.feature.version>1.2.5</appmgt.feature.version>
<carbon.appmgt.version>1.2.2</carbon.appmgt.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.4.2</carbon.store.version> <carbon.store.version>1.4.4</carbon.store.version>
<!-- Cipher tool version--> <!-- Cipher tool version-->
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version> <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>

Write Preview
Loading…
Cancel
Save