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

fixed issues in API publishing

Browse Source
This commit is contained in:
mharindu 2016-05-12 22:02:47 +05:30
parent cacd5bf5ae
commit 566c5e5fb5
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/distribution/src/api-resources/api_templates/velocity_template.xml
View File

@ -329,7 +329,6 @@
#end #end
</inSequence> </inSequence>
<outSequence> <outSequence>
<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtResponseHandler"/>
## check and set response caching ## check and set response caching
#if($responseCacheEnabled) #if($responseCacheEnabled)
<cache scope="per-host" collector="true"/> <cache scope="per-host" collector="true"/>
@ -343,6 +342,7 @@
#if($handlers.size() > 0) #if($handlers.size() > 0)
<handlers xmlns="http://ws.apache.org/ns/synapse"> <handlers xmlns="http://ws.apache.org/ns/synapse">
#foreach($handler in $handlers) #foreach($handler in $handlers)
#if($handler.className != 'org.wso2.carbon.apimgt.usage.publisher.APIMgtUsageHandler')
<handler xmlns="http://ws.apache.org/ns/synapse" class="$handler.className"> <handler xmlns="http://ws.apache.org/ns/synapse" class="$handler.className">
#if($handler.hasProperties()) #if($handler.hasProperties())
#set ($map = $handler.getProperties() ) #set ($map = $handler.getProperties() )
@ -352,6 +352,7 @@
#end #end
</handler> </handler>
#end #end
#end
</handlers> </handlers>
#end #end
#end #end

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

@ -489,6 +489,13 @@
<exclude>jagg/jagg.jag</exclude> <exclude>jagg/jagg.jag</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-publisher/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-publisher
</outputDirectory>
</fileSet>
<!--============ Added with API Features ===============--> <!--============ Added with API Features ===============-->
<fileSet> <fileSet>
@ -510,6 +517,12 @@
<directory>src/api-resources/synapse-configs/default/sequences</directory> <directory>src/api-resources/synapse-configs/default/sequences</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>src/api-resources/synapse-configs/default/sequences</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/server/synapse-configs/default/sequences</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory>src/api-resources/api_templates</directory> <directory>src/api-resources/api_templates</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/api_templates</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/api_templates</outputDirectory>

6
modules/distribution/src/repository/conf/api-manager.xml
View File

@ -26,7 +26,7 @@
<DataSourceName>jdbc/WSO2AM_DB</DataSourceName> <DataSourceName>jdbc/WSO2AM_DB</DataSourceName>
<!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.--> <!-- This parameter is used when adding api management capability to other products like GReg, AS, DSS etc.-->
<GatewayType>None</GatewayType> <GatewayType>Synapse</GatewayType>
<!-- This parameter is used to enable the securevault support when try to publish endpoint secured APIs. Values should be "true" or "false". <!-- This parameter is used to enable the securevault support when try to publish endpoint secured APIs. Values should be "true" or "false".
By default secure vault is disabled.--> By default secure vault is disabled.-->
@ -310,12 +310,12 @@
-ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default. -ThriftServerHost - Allows to configure a hostname for the thrift server. It uses the carbon hostname by default.
--> -->
<KeyValidatorClientType>ThriftClient</KeyValidatorClientType> <KeyValidatorClientType>WSClient</KeyValidatorClientType>
<ThriftClientPort>10397</ThriftClientPort> <ThriftClientPort>10397</ThriftClientPort>
<ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut> <ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut>
<ThriftServerPort>10397</ThriftServerPort> <ThriftServerPort>10397</ThriftServerPort>
<!--ThriftServerHost>localhost</ThriftServerHost--> <!--ThriftServerHost>localhost</ThriftServerHost-->
<EnableThriftServer>true</EnableThriftServer> <EnableThriftServer>false</EnableThriftServer>
<!-- <!--
Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens

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

@ -130,7 +130,7 @@
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>password</GrantTypeName> <GrantTypeName>password</GrantTypeName>
<GrantTypeHandlerImplClass>org.wso2.carbon.identity.oauth2.token.handlers.grant.PasswordGrantHandler</GrantTypeHandlerImplClass> <GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedPasswordGrantHandler</GrantTypeHandlerImplClass>
</SupportedGrantType> </SupportedGrantType>
<SupportedGrantType> <SupportedGrantType>
<GrantTypeName>refresh_token</GrantTypeName> <GrantTypeName>refresh_token</GrantTypeName>
@ -157,7 +157,7 @@
<OAuthCallbackHandlers> <OAuthCallbackHandlers>
<OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/> <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>
</OAuthCallbackHandlers> </OAuthCallbackHandlers>
<OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.PermissionBasedScopeValidator"/> <OAuthScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator"/>
<TokenValidators> <TokenValidators>
<TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/> <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
</TokenValidators> </TokenValidators>

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

@ -514,6 +514,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
@ -1253,6 +1256,10 @@
<id>org.wso2.carbon.apimgt.store.feature.group</id> <id>org.wso2.carbon.apimgt.store.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id> <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>