From d2e914e275783bd0e8e7f809a378c48095fa3e79 Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Mon, 16 May 2016 12:07:57 +0530
Subject: [PATCH] Added new configuration for the webapp publisher and scope
 validator

---
 modules/distribution/src/assembly/bin.xml             | 11 ++++++++++-
 .../src/repository/conf/identity/identity.xml         |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index deb83003..b97f7eee 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -520,7 +520,7 @@
 
         <fileSet>
             <directory>src/api-resources/synapse-configs/default/sequences</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/server/synapse-configs/default/sequences</outputDirectory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/synapse-configs/default/sequences</outputDirectory>
         </fileSet>
 
         <fileSet>
@@ -1023,6 +1023,15 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <!-- Copying webapp-publisher-config.xml -->
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-publisher-config.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!--cdm plugin config file-->
         <file>
             <source>
diff --git a/modules/distribution/src/repository/conf/identity/identity.xml b/modules/distribution/src/repository/conf/identity/identity.xml
index daa82984..e289192c 100644
--- a/modules/distribution/src/repository/conf/identity/identity.xml
+++ b/modules/distribution/src/repository/conf/identity/identity.xml
@@ -157,7 +157,7 @@
         <OAuthCallbackHandlers>
             <OAuthCallbackHandler Class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.DeviceMgtOAuthCallbackHandler"/>
         </OAuthCallbackHandlers>
-        <OAuthScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator"/>
+        <OAuthScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.validators.ExtendedJDBCScopeValidator"/>
         <TokenValidators>
             <TokenValidator type="bearer" class="org.wso2.carbon.identity.oauth2.validators.DefaultOAuth2TokenValidator"/>
         </TokenValidators>