Move ServerRunning to the common jar

Signed-off-by: Rob Gallagher <rgallagher@pivotallabs.com> Signed-off-by: Rob Szumlakowski <rszumlakowski@pivotal.io>
cloudfoundry · Jan 5, 2015 · d8b8ca8 · d8b8ca8
1 parent 2479bfd
commit d8b8ca8
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 13 deletions.
diff --git a/...entity/uaa/integration/ServerRunning.java → ...udfoundry/identity/uaa/ServerRunning.java b/...entity/uaa/integration/ServerRunning.java → ...udfoundry/identity/uaa/ServerRunning.java
@@ -10,7 +10,7 @@
  *     subcomponents is subject to the terms and conditions of the
  *     subcomponent's license, as noted in the LICENSE file.
  *******************************************************************************/
-package org.cloudfoundry.identity.uaa.integration;
+package org.cloudfoundry.identity.uaa;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/...ava/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java b/...ava/org/cloudfoundry/identity/uaa/integration/AuthorizationCodeGrantIntegrationTests.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Rule;

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CfAuthenticationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/CfAuthenticationTests.java
@@ -19,6 +19,7 @@
 
 import java.util.Arrays;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Before;
 import org.junit.Rule;

diff --git a/...st/java/org/cloudfoundry/identity/uaa/integration/CfScimUserEndpointIntegrationTests.java b/...st/java/org/cloudfoundry/identity/uaa/integration/CfScimUserEndpointIntegrationTests.java
@@ -18,6 +18,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
 import org.cloudfoundry.identity.uaa.oauth.UaaOauth2ErrorHandler;
 import org.cloudfoundry.identity.uaa.scim.ScimUser;

diff --git a/...rg/cloudfoundry/identity/uaa/integration/CfUserIdTranslationEndpointIntegrationTests.java b/...rg/cloudfoundry/identity/uaa/integration/CfUserIdTranslationEndpointIntegrationTests.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
 import org.cloudfoundry.identity.uaa.scim.ScimUser;
 import org.cloudfoundry.identity.uaa.scim.ScimUser.Group;

diff --git a/...st/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java b/...st/java/org/cloudfoundry/identity/uaa/integration/CheckTokenEndpointIntegrationTests.java
@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Rule;

diff --git a/.../java/org/cloudfoundry/identity/uaa/integration/ClientAdminEndpointsIntegrationTests.java b/.../java/org/cloudfoundry/identity/uaa/integration/ClientAdminEndpointsIntegrationTests.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.cloudfoundry.identity.uaa.integration;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.error.UaaException;
 import org.cloudfoundry.identity.uaa.oauth.InvalidClientDetailsException;
 import org.cloudfoundry.identity.uaa.oauth.SecretChangeRequest;

diff --git a/...st/java/org/cloudfoundry/identity/uaa/integration/ClientInfoEndpointIntegrationTests.java b/...st/java/org/cloudfoundry/identity/uaa/integration/ClientInfoEndpointIntegrationTests.java
@@ -17,6 +17,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Rule;

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/FormLoginIntegrationTests.java
@@ -17,6 +17,7 @@
 
 import java.util.Arrays;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Rule;

diff --git a/.../test/java/org/cloudfoundry/identity/uaa/integration/HealthzEndpointIntegrationTests.java b/.../test/java/org/cloudfoundry/identity/uaa/integration/HealthzEndpointIntegrationTests.java
@@ -15,6 +15,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;

diff --git a/...st/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java b/...st/java/org/cloudfoundry/identity/uaa/integration/ImplicitTokenGrantIntegrationTests.java
@@ -19,6 +19,7 @@
 import java.net.URI;
 import java.util.Arrays;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Rule;

diff --git a/...est/java/org/cloudfoundry/identity/uaa/integration/LoginInfoEndpointIntegrationTests.java b/...est/java/org/cloudfoundry/identity/uaa/integration/LoginInfoEndpointIntegrationTests.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;

diff --git a/...t/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java b/...t/java/org/cloudfoundry/identity/uaa/integration/LoginServerSecurityIntegrationTests.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.authentication.Origin;
 import org.cloudfoundry.identity.uaa.authentication.UaaAuthenticationDetails;
 import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;

diff --git a/...est/java/org/cloudfoundry/identity/uaa/integration/NativeApplicationIntegrationTests.java b/...est/java/org/cloudfoundry/identity/uaa/integration/NativeApplicationIntegrationTests.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Before;

diff --git a/...oundry/identity/uaa/integration/OpenIdTokenAuthorizationWithApprovalIntegrationTests.java b/...oundry/identity/uaa/integration/OpenIdTokenAuthorizationWithApprovalIntegrationTests.java
@@ -22,9 +22,10 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import org.apache.commons.codec.binary.Base64;
+
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.scim.ScimUser;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;

diff --git a/...ava/org/cloudfoundry/identity/uaa/integration/PasswordChangeEndpointIntegrationTests.java b/...ava/org/cloudfoundry/identity/uaa/integration/PasswordChangeEndpointIntegrationTests.java
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
 import org.cloudfoundry.identity.uaa.scim.ScimUser;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;

diff --git a/...java/org/cloudfoundry/identity/uaa/integration/PasswordCheckEndpointIntegrationTests.java b/...java/org/cloudfoundry/identity/uaa/integration/PasswordCheckEndpointIntegrationTests.java
@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;

diff --git a/...t/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java b/...t/java/org/cloudfoundry/identity/uaa/integration/RefreshTokenSupportIntegrationTests.java
@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.Map;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Before;

diff --git a/...est/java/org/cloudfoundry/identity/uaa/integration/RemoteAuthenticationEndpointTests.java b/...est/java/org/cloudfoundry/identity/uaa/integration/RemoteAuthenticationEndpointTests.java
@@ -26,10 +26,10 @@
 import java.util.Map;
 
 import org.apache.commons.codec.binary.Base64;
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.authentication.Origin;
 import org.cloudfoundry.identity.uaa.oauth.UaaOauth2ErrorHandler;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
-import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.http.HttpEntity;

diff --git a/...st/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java b/...st/java/org/cloudfoundry/identity/uaa/integration/ScimGroupEndpointsIntegrationTests.java
@@ -27,6 +27,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.message.PasswordChangeRequest;
 import org.cloudfoundry.identity.uaa.scim.ScimGroup;
 import org.cloudfoundry.identity.uaa.scim.ScimGroupMember;
@@ -55,7 +56,6 @@
 import org.springframework.security.oauth2.provider.client.BaseClientDetails;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
 @OAuth2ContextConfiguration(OAuth2ContextConfiguration.ClientCredentials.class)

diff --git a/...est/java/org/cloudfoundry/identity/uaa/integration/ScimUserEndpointsIntegrationTests.java b/...est/java/org/cloudfoundry/identity/uaa/integration/ScimUserEndpointsIntegrationTests.java
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.cloudfoundry.identity.uaa.authentication.Origin;
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.scim.ScimUser;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
@@ -38,20 +38,12 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.security.oauth2.client.http.OAuth2ErrorHandler;
 import org.springframework.security.oauth2.client.test.OAuth2ContextConfiguration;
 import org.springframework.security.oauth2.client.test.OAuth2ContextSetup;
 import org.springframework.security.oauth2.common.util.RandomValueStringGenerator;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.ResponseErrorHandler;
-import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
 /**

diff --git a/...test/java/org/cloudfoundry/identity/uaa/integration/UserInfoEndpointIntegrationTests.java b/...test/java/org/cloudfoundry/identity/uaa/integration/UserInfoEndpointIntegrationTests.java
@@ -15,6 +15,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import org.cloudfoundry.identity.uaa.ServerRunning;
 import org.cloudfoundry.identity.uaa.test.TestAccountSetup;
 import org.cloudfoundry.identity.uaa.test.UaaTestAccounts;
 import org.junit.Rule;