From b5d2257e6c39f6b3219532d7bd1d175cceececc2 Mon Sep 17 00:00:00 2001
From: "szt5238@gmail.com" <szt5238@gmail.com>
Date: Sun, 25 Sep 2016 14:24:19 -0400
Subject: [PATCH 1/2] add annotation base configuration,  add spring security

---
 WebContent/WEB-INF/dispatcher-servlet.xml |  7 -------
 pom.xml                                   | 17 +++++++++++++++--
 src/config/AppConfig.java                 | 12 ++++++++++++
 src/config/SpringSecurityInitializer.java | 12 ++++++++++++
 src/config/security/SecurityConfig.java   | 23 +++++++++++++++++++++++
 5 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 src/config/AppConfig.java
 create mode 100644 src/config/SpringSecurityInitializer.java
 create mode 100644 src/config/security/SecurityConfig.java

diff --git a/WebContent/WEB-INF/dispatcher-servlet.xml b/WebContent/WEB-INF/dispatcher-servlet.xml
index 90033a7..9fdb74d 100644
--- a/WebContent/WEB-INF/dispatcher-servlet.xml
+++ b/WebContent/WEB-INF/dispatcher-servlet.xml
@@ -59,13 +59,6 @@
 			class path specify as jsp folder <property name="prefix"> <value>/</value> 
 			</property> <property name="suffix"> <value>.jsp</value> </property> </bean> -->
 
-	
-	
-		<aop:config>
-		    <aop:aspect ref=""></aop:aspect>
-		    
-		    
-		</aop:config>
 
 
 
diff --git a/pom.xml b/pom.xml
index 9f4808b..656b207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>4.3.2.RELEASE</version>
+			<scope>compile</scope>
 		</dependency>
 
 		<!-- SPring and Transactions -->
@@ -96,11 +97,11 @@
 		</dependency>
 
 		<!-- spring-aop -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
 			<version>4.3.2.RELEASE</version>
-		</dependency>
+		</dependency> -->
 
 
 		<!-- spring-web -->
@@ -124,6 +125,18 @@
 			<version>4.2.2.Final</version>
 		</dependency>
 
+		<!-- Spring Security -->
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>3.2.3.RELEASE</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>3.2.3.RELEASE</version>
+		</dependency>
 
 
 		<!-- aspectj-weaver -->
diff --git a/src/config/AppConfig.java b/src/config/AppConfig.java
new file mode 100644
index 0000000..c3a4145
--- /dev/null
+++ b/src/config/AppConfig.java
@@ -0,0 +1,12 @@
+package config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import config.security.SecurityConfig;
+
+//@Configuration
+//@Import({SecurityConfig.class})
+public class AppConfig {
+
+}
diff --git a/src/config/SpringSecurityInitializer.java b/src/config/SpringSecurityInitializer.java
new file mode 100644
index 0000000..aff1f83
--- /dev/null
+++ b/src/config/SpringSecurityInitializer.java
@@ -0,0 +1,12 @@
+package config;
+
+import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
+
+import config.security.SecurityConfig;
+
+
+public class SpringSecurityInitializer extends AbstractSecurityWebApplicationInitializer {
+	public SpringSecurityInitializer(){
+		super(SecurityConfig.class);
+	}
+}
diff --git a/src/config/security/SecurityConfig.java b/src/config/security/SecurityConfig.java
new file mode 100644
index 0000000..d5fc481
--- /dev/null
+++ b/src/config/security/SecurityConfig.java
@@ -0,0 +1,23 @@
+package config.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+	
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception{
+		auth.inMemoryAuthentication().withUser("user").password("user").roles("USER");
+		auth.inMemoryAuthentication().withUser("user1").password("user1").roles("USER");
+		auth.inMemoryAuthentication().withUser("admin").password("admin").roles("ADMIN","USER");
+		
+	}
+	
+	
+	
+}

From fc8457db0510a51ff41451d9dcf2abd1c1509a0a Mon Sep 17 00:00:00 2001
From: amanda <amanda@10.0.0.80>
Date: Sun, 25 Sep 2016 14:31:27 -0400
Subject: [PATCH 2/2] commended ContextLoaderListener

---
 WebContent/WEB-INF/web.xml |  5 +++--
 src/config/AppConfig.java  | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 src/config/AppConfig.java

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index c6315bc..9b60856 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -31,9 +31,10 @@
 		<param-value>/WEB-INF/dispatcher-servlet.xml
 					</param-value>
 	</context-param>
-	<listener>
+	
+	<!-- <listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+	</listener> -->
 	
 	<!-- spring security filter , suggested name springSecurityFilterChain -->
 	<!-- <filter>
diff --git a/src/config/AppConfig.java b/src/config/AppConfig.java
deleted file mode 100644
index c3a4145..0000000
--- a/src/config/AppConfig.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-import config.security.SecurityConfig;
-
-//@Configuration
-//@Import({SecurityConfig.class})
-public class AppConfig {
-
-}