github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed SECOAUTH submodule

pull/306/merge
Justin Richer 2013-04-01 12:03:32 -04:00
parent e2ca73b85b
commit 03a6a15197
5 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "spring-security-oauth"]
path = spring-security-oauth
url = https://github.com/SpringSource/spring-security-oauth.git

1
spring-security-oauth

@ -1 +0,0 @@
Subproject commit 16a40ae98cfc211502ffaabb86b59e1e0a597069

1
upstream-patch/README.txt
View File

@ -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.

26
upstream-patch/fix_authZ_server_config.patch
View File

@ -1,26 +0,0 @@
From c58240f05e58360f4404bf8d9fadfeb624cc5849 Mon Sep 17 00:00:00 2001
From: Amanda Anganes <aanganes@mitre.org>
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

26
upstream-patch/fix_authz_config_CORRECT.patch
View File

@ -1,26 +0,0 @@
From 4a8126d863bd7c1291302da7e6b68d06cf44674c Mon Sep 17 00:00:00 2001
From: Amanda Anganes <aanganes@mitre.org>
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