From cc3f5437683e6773c86d0a380296a3973ac2fb6f Mon Sep 17 00:00:00 2001
From: prabathabey <prabathabey@git.com>
Date: Thu, 28 May 2015 19:45:37 +0530
Subject: [PATCH] Fixing dyanamic client registration related issues

---
 components/oauth-extensions/dynamic-client-manager/pom.xml | 4 ++++
 .../identity/oauth/extension/RegistrationService.java      | 1 -
 .../src/main/webapp/WEB-INF/cxf-servlet.xml                | 4 ++++
 pom.xml                                                    | 7 ++++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/oauth-extensions/dynamic-client-manager/pom.xml b/components/oauth-extensions/dynamic-client-manager/pom.xml
index b00035fa32..03bd254164 100644
--- a/components/oauth-extensions/dynamic-client-manager/pom.xml
+++ b/components/oauth-extensions/dynamic-client-manager/pom.xml
@@ -153,6 +153,10 @@
             <artifactId>json-simple</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/RegistrationService.java b/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/RegistrationService.java
index 88028bbd0f..71bc0089a3 100644
--- a/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/RegistrationService.java
+++ b/components/oauth-extensions/dynamic-client-manager/src/main/java/org/wso2/carbon/identity/oauth/extension/RegistrationService.java
@@ -20,7 +20,6 @@ package org.wso2.carbon.identity.oauth.extension;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
-import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
diff --git a/components/oauth-extensions/dynamic-client-manager/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/oauth-extensions/dynamic-client-manager/src/main/webapp/WEB-INF/cxf-servlet.xml
index 94aac35f68..a38fa222e6 100644
--- a/components/oauth-extensions/dynamic-client-manager/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/oauth-extensions/dynamic-client-manager/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -31,8 +31,12 @@
         <jaxrs:serviceBeans>
             <ref bean="RegistrationServiceBean"/>
         </jaxrs:serviceBeans>
+        <jaxrs:providers>
+            <ref bean="jsonProvider"/>
+        </jaxrs:providers>
     </jaxrs:server>
 
     <bean id="RegistrationServiceBean" class="org.wso2.carbon.identity.oauth.extension.impl.ClientRegistrationServiceImpl"/>
+    <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
 </beans>
 
diff --git a/pom.xml b/pom.xml
index 98d51d2cd8..558ff162fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -912,6 +912,11 @@
                 <artifactId>json-simple</artifactId>
                 <version>${json-simple.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1173,7 +1178,7 @@
         <cxf.version>2.6.1</cxf.version>
         <cxf.bindings.version>2.5.11</cxf.bindings.version>
         <json-simple.version>1.1.wso2v1</json-simple.version>
-
+        <jackson.version>1.9.0</jackson.version>
     </properties>
 
 </project>