merge-requests/1/head
menaka 9 years ago
commit a91f75a34d

@ -322,6 +322,37 @@
</tasks>
</configuration>
</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>
<id>3-extract-docs-from-components</id>
<phase>package</phase>

@ -90,6 +90,8 @@
<exclude>**/plugins/org.wso2.carbon.endpoint.ui*</exclude>
<exclude>**/plugins/org.wso2.carbon.inbound.ui*</exclude>
<exclude>**/plugins/org.wso2.carbon.rest.api.ui*</exclude>
<!--TODO: Remove exclude for asm-all jar after fixing java stack issue-->
<exclude>**/asm-all_4.1.0.wso2v1.jar</exclude>
</excludes>
</fileSet>
@ -283,6 +285,17 @@
</includes>
</fileSet>
<!-- Copying Social plugin related dbscripts -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/social</outputDirectory>
<includes>
<include>*/**</include>
</includes>
</fileSet>
<!--Copying modules-->
<fileSet>
<directory>
@ -1027,9 +1040,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>

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

@ -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,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ Licensed 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.
~ 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.
-->
<axisconfig name="AxisJava2.0">
@ -297,6 +295,6 @@
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
<phase name="Security"/>
<phase name="Transport"/>
<phase name="Transport"/>
</phaseOrder>
</axisconfig>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

@ -159,6 +159,9 @@
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.mobile.device.mgt.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.mobile.device.mgt.version}
</featureArtifactDef>
<!-- Mobile Device Management Features -->
<!-- IoT Device Management Features -->
@ -474,9 +477,9 @@
org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
</featureArtifactDef>
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}-->
<!--</featureArtifactDef>-->
<featureArtifactDef>
org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
</featureArtifactDef>
<featureArtifactDef>
@ -788,12 +791,12 @@
<version>${uuf.version}</version>
</feature>
<!-- MDM Features -->
<!-- IoTServer Features -->
<feature>
<id>org.wso2.iot.styles.feature.group</id>
<version>${carbon.iot.device.mgt.version}</version>
</feature>
<!-- End of MDM Features -->
<!-- End of IoTServer Features -->
<!-- Device Management Features -->
<feature>
@ -808,18 +811,6 @@
<id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
<version>${carbon.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.policy.mgt.server.feature.group</id>
<version>${carbon.device.mgt.version}</version>
@ -858,6 +849,23 @@
</feature>
<!-- End of Device Management Features -->
<feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.mdm.mdmmgt.server.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
@ -1261,10 +1269,10 @@
<!-- End of app management features-->
<!--<feature>-->
<!--<id>org.wso2.carbon.social.feature.group</id>-->
<!--<version>${carbon.store.version}</version>-->
<!--</feature>-->
<feature>
<id>org.wso2.carbon.social.feature.group</id>
<version>${carbon.store.version}</version>
</feature>
<!-- Cipher tool feature -->
<feature>

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