From 49d91bb6979d0734ad75654124a1c0eae878daf4 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Thu, 26 Mar 2015 18:38:16 +0100
Subject: [PATCH] #71 - Upgraded to Spring Security 4.0.

Upgraded security related sample projects in the rest and JPA sub-folders to Spring Security 4.0.
---
 jpa/security/pom.xml                          | 10 ++++
 .../jpa/security/SecurityConfiguration.java   |  1 +
 .../SecurityEvaluationContextExtension.java   | 50 -------------------
 rest/security/pom.xml                         |  4 ++
 4 files changed, 15 insertions(+), 50 deletions(-)
 delete mode 100644 jpa/security/src/main/java/example/springdata/jpa/security/SecurityEvaluationContextExtension.java

diff --git a/jpa/security/pom.xml b/jpa/security/pom.xml
index d03dba83..713eaa2e 100644
--- a/jpa/security/pom.xml
+++ b/jpa/security/pom.xml
@@ -11,11 +11,21 @@
 	<artifactId>spring-data-jpa-security</artifactId>
 	<name>Spring Data JPA - Spring Security integration</name>
 
+	<properties>
+		<spring-security.version>4.0.0.RELEASE</spring-security.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-data</artifactId>
+		</dependency>
+
 	</dependencies>
 
 </project>
diff --git a/jpa/security/src/main/java/example/springdata/jpa/security/SecurityConfiguration.java b/jpa/security/src/main/java/example/springdata/jpa/security/SecurityConfiguration.java
index 209f1e3c..0c83daaa 100644
--- a/jpa/security/src/main/java/example/springdata/jpa/security/SecurityConfiguration.java
+++ b/jpa/security/src/main/java/example/springdata/jpa/security/SecurityConfiguration.java
@@ -19,6 +19,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.repository.query.spi.EvaluationContextExtension;
+import org.springframework.security.data.repository.query.SecurityEvaluationContextExtension;
 
 /**
  * @author Oliver Gierke
diff --git a/jpa/security/src/main/java/example/springdata/jpa/security/SecurityEvaluationContextExtension.java b/jpa/security/src/main/java/example/springdata/jpa/security/SecurityEvaluationContextExtension.java
deleted file mode 100644
index 12f36d3a..00000000
--- a/jpa/security/src/main/java/example/springdata/jpa/security/SecurityEvaluationContextExtension.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package example.springdata.jpa.security;
-
-import org.springframework.data.repository.query.spi.EvaluationContextExtension;
-import org.springframework.data.repository.query.spi.EvaluationContextExtensionSupport;
-import org.springframework.security.access.expression.SecurityExpressionRoot;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * {@link EvaluationContextExtension} to expose Spring Security's principal via a SpEL property.
- *
- * Note that this is just for the sake of demonstration - Spring Security will eventually provide its
- * own EvaluationContext extension.
- * 
- * @author Oliver Gierke
- */
-class SecurityEvaluationContextExtension extends EvaluationContextExtensionSupport {
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.spi.EvaluationContextExtension#getExtensionId()
-	 */
-	@Override
-	public String getExtensionId() {
-		return "security";
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.spi.EvaluationContextExtension#getRootObject()
-	 */
-	@Override
-	public SecurityExpressionRoot getRootObject() {
-		return new SecurityExpressionRoot(SecurityContextHolder.getContext().getAuthentication()) {};
-	}
-}
diff --git a/rest/security/pom.xml b/rest/security/pom.xml
index e7f86d02..02251541 100644
--- a/rest/security/pom.xml
+++ b/rest/security/pom.xml
@@ -12,6 +12,10 @@
 		<version>1.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<spring-security.version>4.0.0.RELEASE</spring-security.version>
+	</properties>
+
 	<dependencies>
 
 		<dependency>