From 566c5e5fb59dcebe73b1fcc32364bf8417c0ed08 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Thu, 12 May 2016 22:02:47 +0530
Subject: [PATCH] fixed issues in API publishing

---
 .../api_templates/velocity_template.xml             |  3 ++-
 modules/distribution/src/assembly/bin.xml           | 13 +++++++++++++
 .../src/repository/conf/api-manager.xml             |  6 +++---
 .../src/repository/conf/identity/identity.xml       |  4 ++--
 modules/p2-profile-gen/pom.xml                      |  7 +++++++
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/modules/distribution/src/api-resources/api_templates/velocity_template.xml b/modules/distribution/src/api-resources/api_templates/velocity_template.xml
index a3d2d0a8..c484f5f2 100644
--- a/modules/distribution/src/api-resources/api_templates/velocity_template.xml
+++ b/modules/distribution/src/api-resources/api_templates/velocity_template.xml
@@ -329,7 +329,6 @@
 #end
 </inSequence>
 <outSequence>
-<class name="org.wso2.carbon.apimgt.usage.publisher.APIMgtResponseHandler"/>
 ## check and set response caching
 #if($responseCacheEnabled)
 <cache scope="per-host" collector="true"/>
@@ -343,6 +342,7 @@
         #if($handlers.size() > 0)
 <handlers xmlns="http://ws.apache.org/ns/synapse">
 #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">
     #if($handler.hasProperties())
     #set ($map = $handler.getProperties() )
@@ -352,6 +352,7 @@
     #end
 </handler>
 #end
+#end
 </handlers>
         #end
         #end
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index fd1d311a..294727a4 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -489,6 +489,13 @@
                 <exclude>jagg/jagg.jag</exclude>
             </excludes>
         </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 ===============-->
         <fileSet>
@@ -510,6 +517,12 @@
             <directory>src/api-resources/synapse-configs/default/sequences</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/apim-synapse-config/</outputDirectory>
         </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>
             <directory>src/api-resources/api_templates</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/api_templates</outputDirectory>
diff --git a/modules/distribution/src/repository/conf/api-manager.xml b/modules/distribution/src/repository/conf/api-manager.xml
index 3e51cb89..22635c5e 100755
--- a/modules/distribution/src/repository/conf/api-manager.xml
+++ b/modules/distribution/src/repository/conf/api-manager.xml
@@ -26,7 +26,7 @@
     <DataSourceName>jdbc/WSO2AM_DB</DataSourceName>
 
     <!-- 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".
 	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.
         -->
 
-        <KeyValidatorClientType>ThriftClient</KeyValidatorClientType>
+        <KeyValidatorClientType>WSClient</KeyValidatorClientType>
         <ThriftClientPort>10397</ThriftClientPort>
         <ThriftClientConnectionTimeOut>10000</ThriftClientConnectionTimeOut>
         <ThriftServerPort>10397</ThriftServerPort>
         <!--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
diff --git a/modules/distribution/src/repository/conf/identity/identity.xml b/modules/distribution/src/repository/conf/identity/identity.xml
index b88ce8ca..daa82984 100644
--- a/modules/distribution/src/repository/conf/identity/identity.xml
+++ b/modules/distribution/src/repository/conf/identity/identity.xml
@@ -130,7 +130,7 @@
             </SupportedGrantType>
             <SupportedGrantType>
                 <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>
                 <GrantTypeName>refresh_token</GrantTypeName>
@@ -157,7 +157,7 @@
         <OAuthCallbackHandlers>
             <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>
         </OAuthCallbackHandlers>
-        <OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.PermissionBasedScopeValidator"/>
+        <OAuthScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator"/>
         <TokenValidators>
             <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
         </TokenValidators>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index f6670e3d..2ca4873c 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -514,6 +514,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
@@ -1253,6 +1256,10 @@
                                     <id>org.wso2.carbon.apimgt.store.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>