community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server

Browse Source
This commit is contained in:
charithag 2015-12-08 22:49:36 +05:30
commit c494db99e7
8 changed files with 102 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/distribution/pom.xml
View File

@ -322,6 +322,37 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </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>

7
modules/distribution/src/assembly/bin.xml
View File

@ -388,6 +388,9 @@
</directory> </directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/ <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
</outputDirectory> </outputDirectory>
<excludes>
<exclude>appmoauth2.war</exclude>
</excludes>
<filtered>false</filtered> <filtered>false</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>
</fileSet> </fileSet>
@ -1024,9 +1027,7 @@
<!-- ************* Data bridge related files ********** --> <!-- ************* Data bridge related files ********** -->
<file> <file>
<!--<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/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>
<!--STORE-1101-->
<source>src/repository/conf/data-bridge/data-bridge-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<fileMode>644</fileMode> <fileMode>644</fileMode>

74
modules/distribution/src/repository/conf/data-bridge/data-bridge-config.xml
View File

@ -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>

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

@ -64,6 +64,27 @@
</definition> </definition>
</datasource> </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>
<!--<datasource>--> <!--<datasource>-->
<!--<name>WSO2_IDENTITY_DB</name>--> <!--<name>WSO2_IDENTITY_DB</name>-->
<!--<description>The datasource used for Identity configurations</description>--> <!--<description>The datasource used for Identity configurations</description>-->

36
modules/distribution/src/repository/conf/identity.xml
View File

@ -106,9 +106,7 @@
<!-- Enable renewal of refresh token for refresh_token grant --> <!-- Enable renewal of refresh token for refresh_token grant -->
<RenewRefreshTokenForRefreshGrant>true</RenewRefreshTokenForRefreshGrant> <RenewRefreshTokenForRefreshGrant>true</RenewRefreshTokenForRefreshGrant>
<!-- Process the token before storing it in database, e.g. encrypting --> <!-- Process the token before storing it in database, e.g. encrypting -->
<TokenPersistenceProcessor> <TokenPersistenceProcessor>org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor</TokenPersistenceProcessor>
org.wso2.carbon.identity.oauth.tokenprocessor.PlainTextPersistenceProcessor
</TokenPersistenceProcessor>
<!-- Supported Client Autnetication Methods --> <!-- Supported Client Autnetication Methods -->
<ClientAuthHandlers> <ClientAuthHandlers>
<ClientAuthHandler <ClientAuthHandler
@ -120,54 +118,38 @@
<SupportedResponseTypes> <SupportedResponseTypes>
<SupportedResponseType> <SupportedResponseType>
<ResponseTypeName>token</ResponseTypeName> <ResponseTypeName>token</ResponseTypeName>
<ResponseTypeHandlerImplClass> <ResponseTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.authz.handlers.TokenResponseTypeHandler</ResponseTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.authz.handlers.TokenResponseTypeHandler
</ResponseTypeHandlerImplClass>
</SupportedResponseType> </SupportedResponseType>
<SupportedResponseType> <SupportedResponseType>
<ResponseTypeName>code</ResponseTypeName> <ResponseTypeName>code</ResponseTypeName>
<ResponseTypeHandlerImplClass> <ResponseTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.authz.handlers.CodeResponseTypeHandler</ResponseTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.authz.handlers.CodeResponseTypeHandler
</ResponseTypeHandlerImplClass>
</SupportedResponseType> </SupportedResponseType>
</SupportedResponseTypes> </SupportedResponseTypes>
<!-- Supported Grant Types --> <!-- Supported Grant Types -->
<SupportedGrantTypes> <SupportedGrantTypes>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>authorization_code</GrantTypeName> <GrantTypeName>authorization_code</GrantTypeName>
<GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler</GrantTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.token.handlers.grant.AuthorizationCodeGrantHandler
</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>password</GrantTypeName> <GrantTypeName>password</GrantTypeName>
<GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler
</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>refresh_token</GrantTypeName> <GrantTypeName>refresh_token</GrantTypeName>
<GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler</GrantTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.token.handlers.grant.RefreshGrantHandler
</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>client_credentials</GrantTypeName> <GrantTypeName>client_credentials</GrantTypeName>
<GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler</GrantTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.token.handlers.grant.ClientCredentialsGrantHandler
</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-bearer</GrantTypeName> <GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-bearer</GrantTypeName>
<GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler</GrantTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.token.handlers.grant.saml.SAML2BearerGrantHandler
</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>iwa:ntlm</GrantTypeName> <GrantTypeName>iwa:ntlm</GrantTypeName>
<GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler</GrantTypeHandlerImplClass>
org.wso2.carbon.identity.oauth2.token.handlers.grant.iwa.ntlm.NTLMAuthenticationGrantHandler
</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
</SupportedGrantTypes> </SupportedGrantTypes>
<OAuthCallbackHandlers> <OAuthCallbackHandlers>

20
modules/integration/tests-ui-integration/src/test/resources/axis2config/axis2_client.xml
View File

@ -1,19 +1,17 @@
<!-- <!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. ~ Copyright 2005-2011 WSO2, Inc. (http://wso2.com)
~ ~
~ WSO2 Inc. licenses this file to you under the Apache License, ~ Licensed under the Apache License, Version 2.0 (the "License");
~ Version 2.0 (the "License"); you may not use this file except ~ you may not use this file except in compliance with the License.
~ in compliance with the License.
~ You may obtain a copy of the License at ~ You may obtain a copy of the License at
~ ~
~ http://www.apache.org/licenses/LICENSE-2.0 ~ http://www.apache.org/licenses/LICENSE-2.0
~ ~
~ Unless required by applicable law or agreed to in writing, ~ Unless required by applicable law or agreed to in writing, software
~ software distributed under the License is distributed on an ~ distributed under the License is distributed on an "AS IS" BASIS,
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ KIND, either express or implied. See the License for the ~ See the License for the specific language governing permissions and
~ specific language governing permissions and limitations ~ limitations under the License.
~ under the License.
--> -->
<axisconfig name="AxisJava2.0"> <axisconfig name="AxisJava2.0">
@ -297,6 +295,6 @@
<phase name="PolicyDetermination"/> <phase name="PolicyDetermination"/>
<phase name="MessageOut"/> <phase name="MessageOut"/>
<phase name="Security"/> <phase name="Security"/>
<phase name="Transport"/> <phase name="Transport"/>
</phaseOrder> </phaseOrder>
</axisconfig> </axisconfig>

33
modules/p2-profile-gen/pom.xml
View File

@ -439,7 +439,7 @@
<!-- App Manager features--> <!-- App Manager features-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>--> <!--<featureArtifactDef>-->
@ -447,23 +447,23 @@
<!--</featureArtifactDef>--> <!--</featureArtifactDef>-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2mdm.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
@ -471,7 +471,7 @@
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt..feature.version} org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
@ -1218,11 +1218,12 @@
<feature> <feature>
<id>org.wso2.carbon.appmgt.core.feature.group</id> <id>org.wso2.carbon.appmgt.core.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<!--<feature>--> <!--<feature>-->
<!--<id>org.wso2.carbon.appmgt.core.feature.group</id>--> <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
<!--<version>${appmgt..feature.version}</version>--> <!--<version>${appmgt.feature.version}</version>-->
<!--</feature>--> <!--</feature>-->
@ -1233,29 +1234,29 @@
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id> <id>org.wso2.carbon.appmgt.mdm.wso2mdm.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.mobile.feature.group</id> <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.publisher.feature.group</id> <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.services.api.feature.group</id> <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.appmgt.store.feature.group</id> <id>org.wso2.carbon.appmgt.store.feature.group</id>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</feature> </feature>
<!-- End of app management features--> <!-- End of app management features-->
@ -1264,7 +1265,7 @@
<id>org.wso2.carbon.social.feature.group</id> <id>org.wso2.carbon.social.feature.group</id>
<version>${carbon.store.version}</version> <version>${carbon.store.version}</version>
</feature> </feature>
<!-- Cipher tool feature --> Cipher tool feature
<feature> <feature>
<id>org.wso2.ciphertool.feature.group</id> <id>org.wso2.ciphertool.feature.group</id>

23
pom.xml
View File

@ -909,49 +909,49 @@
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.core.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.core.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.mdm.wso2emm.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.mdm.wso2mdm.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.mobile.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.publisher.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.services.api.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
<artifactId>org.wso2.carbon.appmgt.store.feature</artifactId> <artifactId>org.wso2.carbon.appmgt.store.feature</artifactId>
<version>${appmgt..feature.version}</version> <version>${appmgt.feature.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.appmgt</groupId> <groupId>org.wso2.carbon.appmgt</groupId>
@ -1062,8 +1062,8 @@
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
<carbon.mediation.version>4.4.11</carbon.mediation.version> <carbon.mediation.version>4.4.11</carbon.mediation.version>
<!-- Carbon Analytics Common --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.0.5</carbon.analytics.common.version> <carbon.analytics.common.version>5.0.6</carbon.analytics.common.version>
<!-- Tomcat --> <!-- Tomcat -->
<orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version> <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@ -1079,7 +1079,6 @@
<!--DAS--> <!--DAS-->
<carbon.analytics.version>1.0.4</carbon.analytics.version> <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> <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<shindig.version>1.0.0</shindig.version> <shindig.version>1.0.0</shindig.version>
<carbon.event-processing.version>2.0.9</carbon.event-processing.version> <carbon.event-processing.version>2.0.9</carbon.event-processing.version>
@ -1103,7 +1102,7 @@
<google.gson.version>2.3.1</google.gson.version> <google.gson.version>2.3.1</google.gson.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt..feature.version>1.1.1</appmgt..feature.version> <appmgt.feature.version>1.1.1</appmgt.feature.version>
<carbon.appmgt.version>1.1.1</carbon.appmgt.version> <carbon.appmgt.version>1.1.1</carbon.appmgt.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->