SECOAUTH-153: renamed 'flow' package

spring-attic · Nov 7, 2011 · 3b90b0a · 3b90b0a
1 parent a02b2d4
commit 3b90b0a
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 20 deletions.
diff --git a/...rklr/src/test/java/org/springframework/security/oauth2/provider/TestImplicitProvider.java b/...rklr/src/test/java/org/springframework/security/oauth2/provider/TestImplicitProvider.java
@@ -1,5 +1,6 @@
 package org.springframework.security.oauth2.provider;
 
+import static org.junit.Assert.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
@@ -11,6 +12,7 @@
 import org.junit.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 
 import com.gargoylesoftware.htmlunit.BrowserVersion;
@@ -106,5 +108,5 @@ public void testBasicImplicitProvider() throws Exception {
 		headers.set("Authorization", String.format("%s %s", OAuth2AccessToken.BEARER_TYPE, accessToken));
 		assertEquals(HttpStatus.OK, serverRunning.getStatusCode("/sparklr/photos?format=json", headers));
 	}
-
+	
 }
diff --git a/...src/test/java/org/springframework/security/oauth/examples/tonr/TestClientConnections.java b/...src/test/java/org/springframework/security/oauth/examples/tonr/TestClientConnections.java
@@ -20,10 +20,10 @@
 import org.springframework.security.oauth2.client.UserRedirectRequiredException;
 import org.springframework.security.oauth2.client.context.OAuth2ClientContextHolder;
 import org.springframework.security.oauth2.client.filter.OAuth2ClientContextImpl;
-import org.springframework.security.oauth2.client.provider.flow.client.ClientCredentialsAccessTokenProvider;
-import org.springframework.security.oauth2.client.provider.flow.client.ClientCredentialsResourceDetails;
-import org.springframework.security.oauth2.client.provider.flow.code.AuthorizationCodeAccessTokenProvider;
-import org.springframework.security.oauth2.client.provider.flow.code.AuthorizationCodeResourceDetails;
+import org.springframework.security.oauth2.client.provider.grant.client.ClientCredentialsAccessTokenProvider;
+import org.springframework.security.oauth2.client.provider.grant.client.ClientCredentialsResourceDetails;
+import org.springframework.security.oauth2.client.provider.grant.code.AuthorizationCodeAccessTokenProvider;
+import org.springframework.security.oauth2.client.provider.grant.code.AuthorizationCodeResourceDetails;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;

diff --git a/...ain/java/org/springframework/security/oauth2/client/filter/OAuth2ClientContextFilter.java b/...ain/java/org/springframework/security/oauth2/client/filter/OAuth2ClientContextFilter.java
@@ -33,8 +33,8 @@
 import org.springframework.security.oauth2.client.http.OAuth2AccessTokenRequiredException;
 import org.springframework.security.oauth2.client.provider.OAuth2AccessTokenProvider;
 import org.springframework.security.oauth2.client.provider.OAuth2AccessTokenProviderChain;
-import org.springframework.security.oauth2.client.provider.flow.client.ClientCredentialsAccessTokenProvider;
-import org.springframework.security.oauth2.client.provider.flow.code.AuthorizationCodeAccessTokenProvider;
+import org.springframework.security.oauth2.client.provider.grant.client.ClientCredentialsAccessTokenProvider;
+import org.springframework.security.oauth2.client.provider.grant.code.AuthorizationCodeAccessTokenProvider;
 import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.common.DefaultThrowableAnalyzer;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;

diff --git a/...ClientCredentialsAccessTokenProvider.java → ...ClientCredentialsAccessTokenProvider.java b/...ClientCredentialsAccessTokenProvider.java → ...ClientCredentialsAccessTokenProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client.provider.flow.client;
+package org.springframework.security.oauth2.client.provider.grant.client;
 
 import java.util.Iterator;
 import java.util.List;

diff --git a/...ent/ClientCredentialsResourceDetails.java → ...ent/ClientCredentialsResourceDetails.java b/...ent/ClientCredentialsResourceDetails.java → ...ent/ClientCredentialsResourceDetails.java
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client.provider.flow.client;
+package org.springframework.security.oauth2.client.provider.grant.client;
 
 import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
 

diff --git a/...AuthorizationCodeAccessTokenProvider.java → ...AuthorizationCodeAccessTokenProvider.java b/...AuthorizationCodeAccessTokenProvider.java → ...AuthorizationCodeAccessTokenProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client.provider.flow.code;
+package org.springframework.security.oauth2.client.provider.grant.code;
 
 import java.util.Iterator;
 import java.util.List;

diff --git a/...ode/AuthorizationCodeResourceDetails.java → ...ode/AuthorizationCodeResourceDetails.java b/...ode/AuthorizationCodeResourceDetails.java → ...ode/AuthorizationCodeResourceDetails.java
@@ -1,4 +1,4 @@
-package org.springframework.security.oauth2.client.provider.flow.code;
+package org.springframework.security.oauth2.client.provider.grant.code;
 
 import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
 

diff --git a/...ain/java/org/springframework/security/oauth2/config/OAuth2ClientBeanDefinitionParser.java b/...ain/java/org/springframework/security/oauth2/config/OAuth2ClientBeanDefinitionParser.java
@@ -28,8 +28,8 @@
 import org.springframework.security.oauth2.client.filter.OAuth2ClientProcessingFilter;
 import org.springframework.security.oauth2.client.filter.flash.HttpSessionClientTokenFlashServices;
 import org.springframework.security.oauth2.client.provider.OAuth2AccessTokenProviderChain;
-import org.springframework.security.oauth2.client.provider.flow.client.ClientCredentialsAccessTokenProvider;
-import org.springframework.security.oauth2.client.provider.flow.code.AuthorizationCodeAccessTokenProvider;
+import org.springframework.security.oauth2.client.provider.grant.client.ClientCredentialsAccessTokenProvider;
+import org.springframework.security.oauth2.client.provider.grant.code.AuthorizationCodeAccessTokenProvider;
 import org.springframework.security.oauth2.client.provider.token.InMemoryOAuth2ClientTokenServices;
 import org.springframework.security.oauth2.provider.filter.CompositeFilter;
 import org.springframework.util.StringUtils;

diff --git a/...n/java/org/springframework/security/oauth2/config/OAuth2ResourceBeanDefinitionParser.java b/...n/java/org/springframework/security/oauth2/config/OAuth2ResourceBeanDefinitionParser.java
@@ -25,8 +25,8 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.security.oauth2.client.provider.flow.client.ClientCredentialsResourceDetails;
-import org.springframework.security.oauth2.client.provider.flow.code.AuthorizationCodeResourceDetails;
+import org.springframework.security.oauth2.client.provider.grant.client.ClientCredentialsResourceDetails;
+import org.springframework.security.oauth2.client.provider.grant.code.AuthorizationCodeResourceDetails;
 import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;

diff --git a/...s/org/springframework/security/oauth2/config/TestProviderBeanDefinitionParser-context.xml b/...s/org/springframework/security/oauth2/config/TestProviderBeanDefinitionParser-context.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
 	xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-1.0.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
@@ -14,8 +13,6 @@
 		</beans:property>
 	</beans:bean>
 
-	<oauth:provider id="oauth2ProviderFilter">
-		<oauth:resource-server resource-id="${my.resource.ids}"/>
-	</oauth:provider>
+	<oauth:resource-server id="oauth2ProviderFilter" resource-id="${my.resource.ids}" />
 
 </beans:beans>