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

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

Browse Source
merge-requests/1/head
Shabirmean 9 years ago
parent 910b52db75 1250743458
commit 865372f9e8
2 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File

36
modules/distribution/src/repository/conf/identity.xml
Unescape 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
Unescape 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>

Write Preview
Loading…
Cancel
Save