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

Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0

Browse Source 
# Conflicts:
#	modules/distribution/src/samples-deployer.xml
merge-requests/1/head
charitha 8 years ago
parent 59207f9980 8a59ae4f68
commit be5d946794
4 changed files with 120 additions and 413 deletions
Show Stats Download Patch File Download Diff File

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

@ -303,6 +303,17 @@
</includes>
</fileSet>
<!-- Copying Certificate management related dbscripts -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/certMgt</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!-- Copying Social plugin related dbscripts -->
<fileSet>
<directory>
@ -550,18 +561,6 @@
</fileSet>
<!-- Analytics related config -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics</outputDirectory>
<includes>
<include>**/analytics-config.xml</include>
<include>**/rdbms-config.xml</include>
<include>**/analytics-data-config.xml</include>
<include>**/analytics-eventsink-config.xml</include>
</includes>
</fileSet>
<fileSet>
<directory>
@ -1162,32 +1161,8 @@
<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- Analytics datasources -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/analytics-datasources.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cep/storm/storm.yaml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/cep/storm/
</outputDirectory>
<filtered>true</filtered>
</file>
<!--DAS Files-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-processor.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/
</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
@ -1227,59 +1202,16 @@
<fileMode>644</fileMode>
</file>
<!-- ************* Data bridge related files end ********** -->
<!--spark udf conf file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-defaults.conf
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--spark classpath config file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/external-spark-classpath.conf
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--spark fair scheduler xml file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/fairscheduler.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--spark udf conf file-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-udf-config.xml
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/spark/
</outputDirectory>
<fileMode>755</fileMode>
</file>
<!--akka conf files-->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/bundle-config/com.typesafe.config/reference.conf
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/bundle-config/com.typesafe.config/
</outputDirectory>
<fileMode>644</fileMode>
</file>
<!--Analytics REST APIs WebApp -->
<!-- ************* Analytics API related files Start ********** -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/analytics.war
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
<source>src/repository/conf/analytics/analytics-data-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<!-- ************* Analytics API related files End ********** -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties

73
modules/distribution/src/repository/conf/analytics/analytics-data-config.xml
Unescape View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<AnalyticsDataConfiguration>
<!--Mode can be either as LOCAL, REMOTE or AUTO. If LOCAL mode is configured the analytics api will lookup -->
<!--necessary services within the the same node, and will invoke then directly without going through network.-->
<!--But If the current node is a light weight node, and doesn't have analytics data services, -->
<!--then the mode should be configured as REMOTE. If AUTO mode is configured, based on the data service availability
it will automatically switch the mode with LOCAL and REMOTE -->
<Mode>AUTO</Mode>
<!--Note: The following parameters will be used only when the mode is configured to REMOTE.-->
<!--The URL of the analytics data service is being hosted-->
<URL>http://localhost:9764</URL>
<!-- A valid user name which have necessary permissions to use the remote services -->
<Username>admin</Username>
<!--A valid password of the user provided above. You also can use secure vault, if you don't want to configure -->
<!--the plain text password here.-->
<Password>admin</Password>
<!--The maximum number of connections made from this node to the remote instances to perform the operations.-->
<MaxConnections>200</MaxConnections>
<!--The maximum number of connections per given route from this node to the remote instances to perform the operations.-->
<MaxConnectionsPerRoute>200</MaxConnectionsPerRoute>
<!--The socket connection timeout when trying to connect the remote service-->
<SocketConnectionTimeout>60000</SocketConnectionTimeout>
<!--The connection timeout when trying to connect the remote service-->
<ConnectionTimeout>60000</ConnectionTimeout>
<!--The path of the trust store location, it will be used if the connection URL is in HTTPS protocol.
If it is not configured, and the client is running from wso2 carbon environment, then by default the trust
store configured from carbon.xml will be picked.-->
<!--<TrustStoreLocation>repository/resources/security/client-truststore.jks</TrustStoreLocation>-->
<!-- The password of the above mentioned trust store, it will be used if the connection URL is in HTTPS protocol.
If it is not configured,and the client is running from wso2 carbon environment, then by default the trust store
configured from carbon.xml will be picked.-->
<!--<TrustStorePassword>wso2carbon</TrustStorePassword>-->
</AnalyticsDataConfiguration>

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

@ -215,9 +215,6 @@
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
</featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
</featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
</featureArtifactDef>
@ -552,56 +549,15 @@
<featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version}
</featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.tracer.feature:${carbon.mediation.version}
</featureArtifactDef-->
<featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version}
</featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.statistics.feature:${carbon.mediation.version}
</featureArtifactDef-->
<!--APIM feature-->
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
</featureArtifactDef>
<!--End of APIM Feature-->
<!--DAS Feature-->
<!--START - Analytics Features -->
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.rdbms.server.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.spark.commons.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.webservice.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.restapi.feature:${carbon.analytics.version}
</featureArtifactDef>
<!-- END - Analytics features -->
<!-- ************** START - Capp Management ********* -->
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@ -609,93 +565,37 @@
<!-- ************** END - Capp Management ********* -->
<!-- ************** START - Data Bridge ************ -->
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.core.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datareceiver.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventsink.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventtable.feature:${carbon.analytics.version}
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.core.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<!-- ************** END - Data Bridge ************ -->
<!-- ************** START - EVENT PROCESSING FEATURES *********** -->
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.simulator.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.core.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.commons.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.stream.persistence.server.feature:${carbon.analytics.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.template.manager.feature:${carbon.analytics.common.version}
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
</featureArtifactDef>
<!-- *************** END OF EVENT PROCESSING FEATURES ********************** -->
<!--End of DAS Feature-->
<!-- Dashboards Features -->
<feaureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version}
</feaureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.deployment.feature:${carbon.dashboard.version}
</featureArtifactDef>
<!-- *************** DAS Client *************** -->
<featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version}
</featureArtifactDef>
<!-- End of Dashboards Features -->
<!-- *************** End of DAS Client *************** -->
<!-- MB Features -->
<featureArtifactDef>
@ -1390,153 +1290,33 @@
<version>${carbon.commons.version}</version>
</feature>
<!-- START - Analytics Features -->
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.spark.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.api.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- ************** START - Data Bridge ************ -->
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<id>org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<!-- END - Analytics features -->
<!-- ************** END - Data Bridge ************ -->
<feature>
<id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.webservice.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.jsservice.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.restapi.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- ************** START - Data Bridge ************ -->
<!-- *************** START - DAS Client *************** -->
<feature>
<id>org.wso2.carbon.databridge.core.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datareceiver.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group
</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.eventsink.feature.group</id>
<id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.eventtable.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- ************** END - Data Bridge ************ -->
<!-- *************** END - DAS Client *************** -->
<!-- ************** START - EVENT PROCESSING FEATURES ************ -->
<feature>
<id>org.wso2.carbon.event.receiver.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.publisher.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.processor.feature.group</id>
<version>${carbon.event-processing.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.tracer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.flow.feature.group</id>
<version>${carbon.event-processing.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.statistics.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.receiver.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.simulator.feature.group</id>
<version>${carbon.event-processing.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.processor.manager.core.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.processor.manager.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.stream.persistence.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.template.manager.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<!-- ************** END - EVENT PROCESSING FEATURES ************ -->
<!-- Dashboard Features -->
<feature>
<id>org.wso2.carbon.dashboards.shindig.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dashboards.portal.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.dashboard.deployment.feature.group</id>
<version>${carbon.dashboard.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<!-- End of Dashboard Features -->
<!-- ************** END - EVENT PROCESSING FEATURES ************ -->
<feature>
<id>org.wso2.carbon.andes.server.feature.group</id>
@ -1734,22 +1514,10 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -1898,10 +1666,6 @@
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature>
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version>
@ -2086,22 +1850,10 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -2318,10 +2070,6 @@
<id>org.wso2.carbon.identity.provider.server.feature.group</id>
<version>${identity.inbound.auth.openid.version}</version>
</feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature>
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version>
@ -2506,22 +2254,10 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
</features>
</configuration>
</execution>
@ -2626,10 +2362,6 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
<version>${carbon.commons.version}</version>
@ -2807,10 +2539,6 @@
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature>
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version>
@ -3042,20 +2770,16 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
<id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
@ -3063,12 +2787,12 @@
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
<id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
</features>
</configuration>
@ -3174,10 +2898,6 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
<version>${carbon.commons.version}</version>
@ -3279,14 +2999,6 @@
<id>org.wso2.carbon.mediation.configadmin.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<!--feature>
<id>org.wso2.carbon.mediation.statistics.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature-->
<!--feature>
<id>org.wso2.carbon.mediation.tracer.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature-->
<feature>
<id>org.wso2.carbon.application.mgt.server.feature.group</id>
<version>${carbon.commons.version}</version>
@ -3351,10 +3063,6 @@
<id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version>
</feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature>
<id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version>
@ -3586,20 +3294,16 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.version}</version>
<id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.spark.commons.feature.group</id>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
@ -3607,12 +3311,12 @@
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
<version>${carbon.analytics.common.version}</version>
<id>org.wso2.carbon.analytics.api.client.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
</features>
</configuration>

6
pom.xml
Unescape View File

@ -1110,7 +1110,8 @@
<carbon.mediation.version>4.6.6</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.4</carbon.analytics.common.version>
<carbon.analytics.common.version>5.1.5-SNAPSHOT</carbon.analytics.common.version>
<carbon.analytics.version>1.2.9-SNAPSHOT</carbon.analytics.version>
<!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1125,11 +1126,8 @@
<axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
<!--DAS-->
<carbon.analytics.version>1.2.8</carbon.analytics.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<carbon.dashboard.version>2.0.2</carbon.dashboard.version>
<shindig.version>2.0.2</shindig.version>
<carbon.event-processing.version>2.1.4</carbon.event-processing.version>
<carbon.data.version>4.3.6</carbon.data.version>
<orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>

Write Preview
Loading…
Cancel
Save