From f987d331b74ab8673bcda19ae4a61606b8f067ab Mon Sep 17 00:00:00 2001
From: Bill Burke <bburke@redhat.com>
Date: Tue, 6 May 2014 20:43:01 -0400
Subject: [PATCH]  /rest removal and pom fixes

---
 audit/jpa/pom.xml                                           | 5 +++++
 audit/mongo/pom.xml                                         | 6 ++++++
 .../org/keycloak/services/resources/RealmsResource.java     | 3 ---
 social/core/pom.xml                                         | 6 ++++++
 .../java/org/keycloak/testsuite/account/AccountTest.java    | 3 ++-
 .../src/test/java/org/keycloak/testsuite/forms/SSOTest.java | 2 +-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/audit/jpa/pom.xml b/audit/jpa/pom.xml
index 067774c665c..a6597476def 100755
--- a/audit/jpa/pom.xml
+++ b/audit/jpa/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>jackson-mapper-asl</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/audit/mongo/pom.xml b/audit/mongo/pom.xml
index 7bb0f6bc5a3..69a5a577c19 100755
--- a/audit/mongo/pom.xml
+++ b/audit/mongo/pom.xml
@@ -13,6 +13,12 @@
     <description/>
 
     <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-core</artifactId>
diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
index 970cdffe620..ed4c3ae6c90 100755
--- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java
@@ -55,9 +55,6 @@ public class RealmsResource {
     @Context
     protected BruteForceProtector protector;
 
-    @Context
-    protected ResteasyProviderFactory providerFactory;
-
     protected TokenManager tokenManager;
     protected SocialRequestManager socialRequestManager;
 
diff --git a/social/core/pom.xml b/social/core/pom.xml
index d19c6caa509..a58813dbffa 100755
--- a/social/core/pom.xml
+++ b/social/core/pom.xml
@@ -20,11 +20,17 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
index 9a7db346a3b..8ec2a9c6920 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
@@ -92,7 +92,7 @@ public class AccountTest {
         }
     });
 
-    public static String ACCOUNT_REDIRECT = AccountService.accountServiceBaseUrl(UriBuilder.fromUri("http://localhost:8081/auth")).build("test").toString();
+    public static String ACCOUNT_REDIRECT = AccountService.loginRedirectUrl(UriBuilder.fromUri("http://localhost:8081/auth")).build("test").toString();
 
     @Rule
     public AssertEvents events = new AssertEvents(keycloakRule);
@@ -237,6 +237,7 @@ public class AccountTest {
             changePasswordPage.open();
             loginPage.login("test-user@localhost", "password");
 
+
             events.expectLogin().client("account").detail(Details.REDIRECT_URI, ACCOUNT_REDIRECT + "?path=password").assertEvent();
 
             changePasswordPage.changePassword("", "new", "new");
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/SSOTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/SSOTest.java
index 3dac594d36c..161d93b86e6 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/SSOTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/SSOTest.java
@@ -92,7 +92,7 @@ public class SSOTest {
         Assert.assertTrue(profilePage.isCurrent());
 
         events.expectLogin().detail(Details.AUTH_METHOD, "sso").removeDetail(Details.USERNAME).client("test-app").assertEvent();
-        events.expectLogin().detail(Details.AUTH_METHOD, "sso").removeDetail(Details.USERNAME).client("account").detail(Details.REDIRECT_URI, AccountService.loginRedirectUrl(UriBuilder.fromUri("http://localhost:8081/auth")).build("rest").toString()).assertEvent();
+        events.expectLogin().detail(Details.AUTH_METHOD, "sso").removeDetail(Details.USERNAME).client("account").detail(Details.REDIRECT_URI, AccountService.loginRedirectUrl(UriBuilder.fromUri("http://localhost:8081/auth")).build("test").toString()).assertEvent();
     }
 
 }