Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature

application-manager-new
Shabirmean 9 years ago
parent 63dcd1e04e
commit 9ae9bcfb31

@ -1027,9 +1027,7 @@
<!-- ************* Data bridge related files ********** -->
<file>
<!--<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>-->
<!--STORE-1101-->
<source>src/repository/conf/data-bridge/data-bridge-config.xml</source>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>

@ -1,74 +0,0 @@
<!--
~ 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.
-->
<dataBridgeConfiguration>
<StreamDefinitionStore>
org.wso2.carbon.databridge.streamdefn.cassandra.datastore.CassandraStreamDefinitionStore
</StreamDefinitionStore>
<workerThreads>10</workerThreads>
<eventBufferCapacity>10000</eventBufferCapacity>
<clientTimeoutMS>30000</clientTimeoutMS>
<keySpaceName>EVENT_KS</keySpaceName>
<!-- Default configuration for thriftDataReceiver -->
<thriftDataReceiver>
<!--<hostName>localhost</hostName>-->
<port>7611</port>
<securePort>7711</securePort>
</thriftDataReceiver>
<!--<streamDefinitions>
<streamDefinition>
{
'name':'org.wso2.esb.MediatorStatistics',
'version':'1.3.0',
'nickName': 'Stock Quote Information',
'description': 'Some Desc',
'metaData':[
{'name':'ipAdd','type':'STRING'}
],
'payloadData':[
{'name':'symbol','type':'STRING'},
{'name':'price','type':'DOUBLE'},
{'name':'volume','type':'INT'},
{'name':'max','type':'DOUBLE'},
{'name':'min','type':'Double'}
]
}
</streamDefinition>
<streamDefinition domainName="wso2">
{
'name':'org.wso2.esb.MediatorStatistics',
'version':'1.3.4',
'nickName': 'Stock Quote Information',
'description': 'Some Other Desc',
'metaData':[
{'name':'ipAdd','type':'STRING'}
],
'payloadData':[
{'name':'symbol','type':'STRING'},
{'name':'price','type':'DOUBLE'},
{'name':'volume','type':'INT'}
]
}
</streamDefinition>
</streamDefinitions>-->
</dataBridgeConfiguration>

@ -1062,8 +1062,8 @@
<!-- Carbon Mediation -->
<carbon.mediation.version>4.4.11</carbon.mediation.version>
<!-- Carbon Analytics Common -->
<carbon.analytics.common.version>5.0.5</carbon.analytics.common.version>
<!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.0.6</carbon.analytics.common.version>
<!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1079,7 +1079,6 @@
<!--DAS-->
<carbon.analytics.version>1.0.4</carbon.analytics.version>
<carbon.analytics.common.version>5.0.6</carbon.analytics.common.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<shindig.version>1.0.0</shindig.version>
<carbon.event-processing.version>2.0.9</carbon.event-processing.version>

Loading…
Cancel
Save