Merge pull request #157 from GPrathap/master

fixing IOTS-201
merge-requests/1/head
Ruwan 9 years ago
commit 3d87a4652c

@ -604,9 +604,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.dashboard.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version} org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version}
</featureArtifactDef> </featureArtifactDef>
@ -692,12 +689,18 @@
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--End of DAS Feature--> <!--End of DAS Feature-->
<!-- Dashboards Features -->
<feaureArtifactDef> <feaureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version} org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version}
</feaureArtifactDef> </feaureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version} org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.deployment.feature:${carbon.dashboard.version}
</featureArtifactDef>
<!-- End of Dashboards Features -->
<!-- MB Features --> <!-- MB Features -->
<featureArtifactDef> <featureArtifactDef>
@ -1367,10 +1370,6 @@
<id>org.wso2.carbon.analytics.messageconsole.feature.group</id> <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.dashboard.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.activitydashboard.feature.group</id> <id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
@ -1471,8 +1470,9 @@
<id>org.wso2.carbon.event.execution.manager.feature.group</id> <id>org.wso2.carbon.event.execution.manager.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<!-- ************** END - EVENT PROCESSING FEATURES ************ --> <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
<!-- Dashboard Features -->
<feature> <feature>
<id>org.wso2.carbon.dashboards.shindig.feature.group</id> <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
<version>${carbon.dashboard.version}</version> <version>${carbon.dashboard.version}</version>
@ -1481,6 +1481,12 @@
<id>org.wso2.carbon.dashboards.portal.feature.group</id> <id>org.wso2.carbon.dashboards.portal.feature.group</id>
<version>${carbon.dashboard.version}</version> <version>${carbon.dashboard.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.dashboard.deployment.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<!-- End of Dashboard Features -->
<feature> <feature>
<id>org.wso2.carbon.andes.server.feature.group</id> <id>org.wso2.carbon.andes.server.feature.group</id>
<version>${carbon.messaging.version}</version> <version>${carbon.messaging.version}</version>

Loading…
Cancel
Save