From 03a6a15197479cb726d033ae69c3d83812a7acdf Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 1 Apr 2013 12:03:32 -0400 Subject: [PATCH] removed SECOAUTH submodule --- .gitmodules | 3 --- spring-security-oauth | 1 - upstream-patch/README.txt | 1 - upstream-patch/fix_authZ_server_config.patch | 26 ------------------- upstream-patch/fix_authz_config_CORRECT.patch | 26 ------------------- 5 files changed, 57 deletions(-) delete mode 160000 spring-security-oauth delete mode 100644 upstream-patch/README.txt delete mode 100644 upstream-patch/fix_authZ_server_config.patch delete mode 100644 upstream-patch/fix_authz_config_CORRECT.patch diff --git a/.gitmodules b/.gitmodules index b261383e4..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "spring-security-oauth"] - path = spring-security-oauth - url = https://github.com/SpringSource/spring-security-oauth.git diff --git a/spring-security-oauth b/spring-security-oauth deleted file mode 160000 index 16a40ae98..000000000 --- a/spring-security-oauth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 16a40ae98cfc211502ffaabb86b59e1e0a597069 diff --git a/upstream-patch/README.txt b/upstream-patch/README.txt deleted file mode 100644 index cf7d5d9e5..000000000 --- a/upstream-patch/README.txt +++ /dev/null @@ -1 +0,0 @@ -This directory contains .patch files which must be applied to the upstream spring-security-oauth2 module in order for the project to build. diff --git a/upstream-patch/fix_authZ_server_config.patch b/upstream-patch/fix_authZ_server_config.patch deleted file mode 100644 index 3da93bbc3..000000000 --- a/upstream-patch/fix_authZ_server_config.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c58240f05e58360f4404bf8d9fadfeb624cc5849 Mon Sep 17 00:00:00 2001 -From: Amanda Anganes -Date: Tue, 13 Mar 2012 16:40:00 -0400 -Subject: [PATCH] Line 89: changed "services-ref" to "authorization-code-services-ref" - ---- - .../AuthorizationServerBeanDefinitionParser.java | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java -index 83c25e2..d1f9445 100644 ---- a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java -+++ b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java -@@ -86,7 +86,8 @@ public class AuthorizationServerBeanDefinitionParser extends ProviderBeanDefinit - String approvalPage = authorizationCodeElement.getAttribute("user-approval-page"); - String approvalHandlerRef = authorizationCodeElement.getAttribute("approval-handler-ref"); - String approvalParameter = authorizationCodeElement.getAttribute("approval-parameter-name"); -- String authorizationCodeServices = authorizationCodeElement.getAttribute("services-ref"); -+ //AANGANES 3/9/2011: added changed "services-ref" to "authorization-code-services-ref" -+ String authorizationCodeServices = authorizationCodeElement.getAttribute("authorization-code-services-ref"); - String redirectResolverRef = authorizationCodeElement.getAttribute("redirect-resolver-ref"); - String clientTokenCacheRef = authorizationCodeElement.getAttribute("client-token-cache-ref"); - String authorizationCodeRedirectStrategyRef = authorizationCodeElement --- -1.7.3.1.msysgit.0 - diff --git a/upstream-patch/fix_authz_config_CORRECT.patch b/upstream-patch/fix_authz_config_CORRECT.patch deleted file mode 100644 index d7ace18ba..000000000 --- a/upstream-patch/fix_authz_config_CORRECT.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4a8126d863bd7c1291302da7e6b68d06cf44674c Mon Sep 17 00:00:00 2001 -From: Amanda Anganes -Date: Wed, 14 Mar 2012 15:38:36 -0400 -Subject: [PATCH] Fixing config/AuthorizationServerBeanDefinitionParser.java - ---- - .../AuthorizationServerBeanDefinitionParser.java | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java -index 74a004d..9d2ff06 100644 ---- a/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java -+++ b/spring-security-oauth2/src/main/java/org/springframework/security/oauth2/config/AuthorizationServerBeanDefinitionParser.java -@@ -112,7 +112,8 @@ public class AuthorizationServerBeanDefinitionParser extends ProviderBeanDefinit - if (authorizationCodeElement != null - && !"true".equalsIgnoreCase(authorizationCodeElement.getAttribute("disabled"))) { - // authorization code grant configuration. -- String authorizationCodeServices = authorizationCodeElement.getAttribute("services-ref"); -+ //AANGANES 3/9/2011: added changed "services-ref" to "authorization-code-services-ref" -+ String authorizationCodeServices = authorizationCodeElement.getAttribute("authorization-code-services-ref"); - String clientTokenCacheRef = authorizationCodeElement.getAttribute("client-token-cache-ref"); - - BeanDefinitionBuilder authorizationCodeTokenGranterBean = BeanDefinitionBuilder --- -1.7.3.1.msysgit.0 -