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

Revert: Removing DAS components.

Browse Source
application-manager-new
sinthuja 8 years ago
parent c9a652e04b
commit 60bfc15344
5 changed files with 414 additions and 110 deletions
Show Stats Download Patch File Download Diff File

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

@ -550,6 +550,18 @@
</fileSet> </fileSet>
<!-- Analytics related config --> <!-- 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> <fileSet>
<directory> <directory>
@ -1132,8 +1144,32 @@
<outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </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--> <!--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> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
@ -1173,16 +1209,59 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- ************* Data bridge related files end ********** --> <!-- ************* Data bridge related files end ********** -->
<!--spark udf conf file-->
<!-- ************* Analytics API related files Start ********** -->
<file> <file>
<source>src/repository/conf/analytics/analytics-data-config.xml</source> <source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/analytics/</outputDirectory> ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/analytics/spark/spark-defaults.conf
<filtered>true</filtered> </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 -->
<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>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<!-- ************* Analytics API related files End ********** -->
<file> <file>
<source> <source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties ../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

@ -1,73 +0,0 @@
<?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>

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

@ -185,7 +185,7 @@
</build> </build>
<properties> <properties>
<carbon.device.mgt.plugin.version>2.2.6-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
</properties> </properties>
<pluginRepositories> <pluginRepositories>

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

@ -212,6 +212,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
</featureArtifactDef-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
@ -546,15 +549,56 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version} org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.tracer.feature:${carbon.mediation.version}
</featureArtifactDef-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version} org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version}
</featureArtifactDef> </featureArtifactDef>
<!--featureArtifactDef>
org.wso2.carbon.mediation:org.wso2.carbon.mediation.statistics.feature:${carbon.mediation.version}
</featureArtifactDef-->
<!--APIM feature--> <!--APIM feature-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
</featureArtifactDef> </featureArtifactDef>
<!--End of APIM Feature--> <!--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 ********* --> <!-- ************** START - Capp Management ********* -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
@ -562,37 +606,93 @@
<!-- ************** END - Capp Management ********* --> <!-- ************** END - Capp Management ********* -->
<!-- ************** START - Data Bridge ************ --> <!-- ************** 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> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.core.server.feature:${carbon.analytics.common.version} 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}
</featureArtifactDef> </featureArtifactDef>
<!-- ************** END - Data Bridge ************ --> <!-- ************** END - Data Bridge ************ -->
<!-- ************** START - EVENT PROCESSING FEATURES *********** --> <!-- ************** 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> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version}
</featureArtifactDef> </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> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version} 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}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version} 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>
<featureArtifactDef> <featureArtifactDef>
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 EVENT PROCESSING FEATURES ********************** -->
<!-- *************** DAS Client *************** -->
<!--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>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version} org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
<!-- *************** End of DAS Client *************** --> <!-- End of Dashboards Features -->
<!-- MB Features --> <!-- MB Features -->
<featureArtifactDef> <featureArtifactDef>
@ -1283,34 +1383,154 @@
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
</feature> </feature>
<!-- ************** START - Data Bridge ************ --> <!-- 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>
<feature> <feature>
<id>org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group</id> <id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<!-- ************** END - Data Bridge ************ --> <!-- END - Analytics features -->
<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 - DAS Client *************** --> <!-- ************** START - Data Bridge ************ -->
<feature> <feature>
<id>org.wso2.carbon.analytics.api.client.feature.group</id> <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>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<!-- *************** END - DAS Client *************** --> <feature>
<id>org.wso2.carbon.analytics.eventtable.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<!-- ************** END - Data Bridge ************ -->
<!-- ************** START - EVENT PROCESSING FEATURES ************ --> <!-- ************** 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> <feature>
<id>org.wso2.carbon.event.stream.feature.group</id> <id>org.wso2.carbon.event.stream.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </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> <feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id> <id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </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 ************ --> <!-- ************** 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 -->
<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>
@ -1507,10 +1727,22 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </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> </features>
</configuration> </configuration>
</execution> </execution>
@ -1659,6 +1891,10 @@
<id>org.wso2.carbon.relay.server.feature.group</id> <id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -1843,10 +2079,22 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </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> </features>
</configuration> </configuration>
</execution> </execution>
@ -2063,6 +2311,10 @@
<id>org.wso2.carbon.identity.provider.server.feature.group</id> <id>org.wso2.carbon.identity.provider.server.feature.group</id>
<version>${identity.inbound.auth.openid.version}</version> <version>${identity.inbound.auth.openid.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2247,10 +2499,22 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </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> </features>
</configuration> </configuration>
</execution> </execution>
@ -2351,6 +2615,10 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<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>
@ -2528,6 +2796,10 @@
<id>org.wso2.carbon.relay.server.feature.group</id> <id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2759,16 +3031,20 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.stream.feature.group</id> <id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id> <id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
@ -2776,12 +3052,12 @@
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id> <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.api.client.feature.group</id> <id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
@ -2883,6 +3159,10 @@
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id>
<version>${carbon.analytics.common.version}</version>
</feature>
<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>
@ -2984,6 +3264,14 @@
<id>org.wso2.carbon.mediation.configadmin.feature.group</id> <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </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> <feature>
<id>org.wso2.carbon.application.mgt.server.feature.group</id> <id>org.wso2.carbon.application.mgt.server.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -3048,6 +3336,10 @@
<id>org.wso2.carbon.relay.server.feature.group</id> <id>org.wso2.carbon.relay.server.feature.group</id>
<version>${carbon.mediation.version}</version> <version>${carbon.mediation.version}</version>
</feature> </feature>
<!--feature>
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.commons.version}</version>
</feature-->
<feature> <feature>
<id>org.wso2.carbon.event.common.feature.group</id> <id>org.wso2.carbon.event.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -3279,16 +3571,20 @@
<id>org.wso2.carbon.certificate.mgt.server.feature.group</id> <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.analytics.core.feature.group</id>
<version>${carbon.analytics.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.stream.feature.group</id> <id>org.wso2.carbon.analytics.datasource.rdbms.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.input.adapter.server.feature.group</id> <id>org.wso2.carbon.spark.commons.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
@ -3296,12 +3592,12 @@
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.event.application.deployer.feature.group</id> <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.api.client.feature.group</id> <id>org.wso2.carbon.databridge.commons.thrift.server.feature.group</id>
<version>${carbon.analytics.version}</version> <version>${carbon.analytics.common.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>

6
pom.xml
Unescape View File

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

Write Preview
Loading…
Cancel
Save